1608 - Introduce hg class draft