Workshop refactor