Ported demos to revised directives