Added functionality for validators