Added models, modified routes