Add blank validator
Remove .*IfNotEmpty structures