Updated Validator.cpp