Improved the field validation support