added router and requestHandler