Expand validator service