updated models and routes