updated models and location routes