CW-222: Directive refactoring