Updated model and route files