Changes for API

API implementation