Make it optional to prepare the validation set