Separating concerns, adding directives