DSL changes for Groovy and Java