Keenan - Finished refactoring all directives