Validator Improved