Fixed the changes for API