[u] Refactor to service validation feature