Added conditional validators