Add vendor & device refs, add <device_only> for remap item