Improved validation
Improved validation