Improved Validator