More fields validator enhancements