Some logical rework on validators