Directive improvements