enhancement: updated common classes base class