Leena&Michal: Refactor claim draft functions into draft_api