Improved validation classes