API support cleanup, easier understanding