3a8eec7 group DSL refactoring