- Fix API implementation
