Improve getting Service with specific version