Reworked routes, models, etc.