Initial support for the Draft namespace
fix draft support