Redesign validators (WIP)