Enhancements in Custom validation