Added router and controller