Improved validators module.