Device_id support fixed