Adding models, reduced boiler plate and more descriptive router del