Updated to comply with new Validator class.