Change from device_id to model and firmware_version to version