Fix Space.Set and remove Space.Current (replaced by State)