Added workshop related functionality