Updated to new directive-structure