More work on device info