Made modular common directives