diff --git a/ROADMAP.md b/ROADMAP.md
index 2b7b3702..72ff411a 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -10,13 +10,18 @@ We hope that the items listed below will inspire further engagement from the com
 
 ## 2021 Q3
 - [x] Support `goctl model pg` to support PostgreSQL code generation
-- [ ] Support `goctl mock` command to start a mocking server with given `.api` file
-- [ ] Adapt builtin tracing mechanism to opentracing solutions
+- [x] Adapt builtin tracing mechanism to opentracing solutions
 
 ## 2021 Q4
+- [x] Support `username/password` authentication in ETCD
+- [x] Support `SSL/TLS` in `zRPC`
+- [ ] Support `retry strategies` in `zRPC`
+- [ ] Support `TLS` in redis connections
+
+## 2022
+- [ ] Support `goctl mock` command to start a mocking server with given `.api` file
 - [ ] Add `httpx.Client` with governance, like circuit breaker etc.
 - [ ] Support `goctl doctor` command to report potential issues for given service
 - [ ] Support `context` in redis related methods for timeout and tracing
 - [ ] Support `context` in sql related methods for timeout and tracing
 - [ ] Support `context` in mongodb related methods for timeout and tracing
-- [ ] Support TLS in redis connections
diff --git a/zrpc/internal/client_test.go b/zrpc/internal/client_test.go
index af6eed78..a548d97c 100644
--- a/zrpc/internal/client_test.go
+++ b/zrpc/internal/client_test.go
@@ -24,6 +24,13 @@ func TestWithTimeout(t *testing.T) {
 	assert.Equal(t, time.Second, options.Timeout)
 }
 
+func TestWithRetry(t *testing.T) {
+	var options ClientOptions
+	opt := WithRetry()
+	opt(&options)
+	assert.True(t, options.Retry)
+}
+
 func TestWithUnaryClientInterceptor(t *testing.T) {
 	var options ClientOptions
 	opt := WithUnaryClientInterceptor(func(ctx context.Context, method string, req, reply interface{},