Moved sections to separate directives