Some changes as Workspace changes