Removed return on Workshop constructor
Added substitute labels
Removed web config
Fixed single class bug regression