Rethink validators