Added a model for location and modified the need to specify a location