Improved validation support