Updated machine class