Improve EXT device support