Updated model and route files 2