Updated validation functions