Smnall changes in the API class.