Updated to work with Validation.