Updated models and routes