Updates to scheme to use workspace.