Improve teh validation logic