Modularize validators