Updates to new workspace structure