Adding custom validator support