- REFactored. Interface and base class cleanup.