Add changes to avoid dataset comprobation before parsing data