- Changed the workbench class to a full generic class and adjusted the
class methods and the calls to these methods