Update on current API draft