Added changes for api