Split fully into single value valiators and dictionary validators