Improved validators