Fixed package name; Added support for drafts.