More DemiMaker markup