Added ability to have custom validators