Add necessary changes to make the API work on Modular code

Jira Issue: WP-1041