Added base WorkspaceManager class
Merge with HEAD.