diff --git a/rpc/server.nim b/rpc/server.nim
index 18a73bb..7a9e4dd 100644
--- a/rpc/server.nim
+++ b/rpc/server.nim
@@ -58,6 +58,11 @@ const
       (INVALID_REQUEST, "No id specified")
     ]
 
+proc newRpcServer*[T]: RpcServer[T] =
+  result = RpcServer[T]()
+  result.procs = newTable[string, RpcProc]()
+  result.servers = @[]
+
 # Utility functions
 # TODO: Move outside server
 func `%`*(p: Port): JsonNode = %(p.int)
diff --git a/rpcstreamservers.nim b/rpcstreamservers.nim
index 13f6cc6..7155a21 100644
--- a/rpcstreamservers.nim
+++ b/rpcstreamservers.nim
@@ -11,9 +11,7 @@ type RpcStreamServer* = RpcServer[StreamServer]
 
 proc newRpcStreamServer*(addresses: openarray[TransportAddress]): RpcStreamServer = 
   ## Create new server and assign it to addresses ``addresses``.
-  result = RpcServer[StreamServer]()
-  result.procs = newTable[string, RpcProc]()
-  result.servers = newSeq[StreamServer]()
+  result = newRpcServer[StreamServer]()
 
   for item in addresses:
     try: