Add some parsing to the validation