Move to an Entity Centric View