Updating to new workspace format