validator enhancement