Dirk refactor aggregate directives