Add group DSL support