Add checklists into validators. #12