replace Workspace
Update Holder and Mutator types to conform with master