More fixes and API implementation