Added more Validation code.