DeviceSnapshot Refactoring