Refactored Workspace