Added location retrieval to EntityManagerDataService, and made a few changes in LocationModel to reflect that.