Add more checks on the datasets