Redesign the validators