add support for nested workspaces