Adding support for API calls from UI