Improved modularization of directives.