CDB-4089 Better usage of data_type field
CDB-4089 Added data_type to stats