Improved Validation