Added support for drafts