Updated ClientAPI draft.