change Device to use UUID