API implementation: improvements