Improvements to Routes and Templates