Enabled support for the API client