Improving validation