Make location an Entity