Improved directives