API performance improvement