Additional Validation Improvements