Major update to workspace