Improved validation for inclusion