Added base CLI class