Enhanced the validation framework