Moved DeviceHolder inner class to standalone