Add support for projects and workspaces