Improve service spec converge