Refactored some builtin validators to use new "validators" array