WP-3480 Added validate function