More work on Doop DSL