Switch to an xml based dsl