drafts support

Added partial draft support