Added more directives