changes to API classes