Better dirty dataset handling