New directives + unit tests