Moved some features from a private repo to ftw.workspace
Add upgrade step
Remove unused code in helper