adding support for custom apis