Let it be as is for now. I suggest to make list with every disk we discovered and put them to device.map in future.