We should preserve $this->class until release