Changes done for device Authentication