Added initial workspace management code