Wip/dsl extensions