Modify device ID request mechanism to break into separate events