v1: Updates to workspace