Adding code to support drafts.