Dsl units

This PR replaces gh-3099 so it can be taken out of breaking. Few commits added to fix update scripts.