Add most API implementation