Updated to reflect changes in directives