Added base machine class