Added location to Entity Constructors