Add device_type field to device_parsers and type field to device