Cleaning up some TODOs, introduced new config value for requestHandler