Support for drafts (partial)

Support for drafts partial