Added support for multiple API's