Minor improvements to API class