enhance validator service