Changes for API

Changes for API