Updates to yaml based dsl.