enhance validator