Expanded routes, added templates