Added workspaces to models