Added current API implementation