Added compatibility for validators