DSL added, tweaks to make it work