add additional validation checks