adding support for custom request handlers