Updated for newest router
Updated for newest router and change templates names