Adding check for machine id