Improve Validation