Added base class and circular list