API implementation: improvements
API implementation: improvements