Added Location to model and added services to Model and REST