added support for calls and API exposing