CMS-3610 Refactor WorkspaceStore

Temporary rollback to old storage while trying to solve some issues