Added router and request handlers