Fixed API implementation