Added initial support for dynamic workspaces.