Updated API draft.