Added base class framework