diff --git a/modules/internal/src/main/scala/service.scala b/modules/internal/src/main/scala/service.scala
index 85a97c47e..2c1fbba8e 100644
--- a/modules/internal/src/main/scala/service.scala
+++ b/modules/internal/src/main/scala/service.scala
@@ -273,16 +273,16 @@ private[internal] object utils {
   // format: OFF
   def buildRequests(algName: Type.Name, typeParam: Type.Param, stats: List[Stat]): List[RPCRequest] = stats.collect {
     case q"@rpc($s) @stream[ResponseStreaming.type] def $name[..$tparams]($request): $typeParam[Observable[$response]]" =>
-      RPCRequest(algName, name, utils.serializationType(s), Some(ResponseStreaming), paramTpe(request), response)
+      Option(RPCRequest(algName, name, utils.serializationType(s), Some(ResponseStreaming), paramTpe(request), response))
     case q"@rpc($s) @stream[RequestStreaming.type] def $name[..$tparams]($paranName: Observable[$request]): $typeParam[$response]" =>
-      RPCRequest(algName, name, utils.serializationType(s), Some(RequestStreaming), request, response)
+      Option(RPCRequest(algName, name, utils.serializationType(s), Some(RequestStreaming), request, response))
     case q"@rpc($s) @stream[BidirectionalStreaming.type] def $name[..$tparams]($paranName: Observable[$request]): $typeParam[Observable[$response]]" =>
-      RPCRequest(algName, name, utils.serializationType(s), Some(BidirectionalStreaming), request, response)
+      Option(RPCRequest(algName, name, utils.serializationType(s), Some(BidirectionalStreaming), request, response))
     case q"@rpc($s) def $name[..$tparams]($request): $typeParam[$response]" =>
-      RPCRequest(algName, name, utils.serializationType(s), None, paramTpe(request), response)
+      Option(RPCRequest(algName, name, utils.serializationType(s), None, paramTpe(request), response))
     case e =>
-      throw new MatchError("Unmatched rpc method: " + e.toString())
-  }
+      None
+  }.flatten
   // format: ON
 
   private[internal] def methodType(s: Option[StreamingType]): Term.Select = s match {
diff --git a/modules/server/src/test/scala/TaglessUtils.scala b/modules/server/src/test/scala/TaglessUtils.scala
index 2277d910e..d822083e6 100644
--- a/modules/server/src/test/scala/TaglessUtils.scala
+++ b/modules/server/src/test/scala/TaglessUtils.scala
@@ -21,6 +21,7 @@ import freestyle.free._
 import freestyle.free.asyncCatsEffect.implicits._
 import freestyle.rpc.common._
 import freestyle.rpc.protocol._
+import freestyle.tagless.tagless
 import monix.eval.Task
 import monix.reactive.Observable
 
@@ -28,7 +29,7 @@ object TaglessUtils extends CommonUtils {
 
   object service {
 
-    @freestyle.tagless.tagless
+    @tagless
     @service
     trait TaglessRPCService {
 
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index e52b2460d..fb4867b98 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -18,7 +18,7 @@ object ProjectPlugin extends AutoPlugin {
 
     lazy val V = new {
       val avro4s: String    = "1.8.0"
-      val frees: String     = "0.5.1"
+      val frees: String     = "0.5.2"
       val grpc: String      = "1.7.1"
       val pbdirect: String  = "0.0.8"
       val scalameta: String = "1.8.0"
@@ -56,7 +56,7 @@ object ProjectPlugin extends AutoPlugin {
         %("grpc-stub", V.grpc),
         %%("monix"),
         %%("pbdirect", V.pbdirect),
-        "com.sksamuel.avro4s"     %% "avro4s-core" % V.avro4s,
+        %%("avro4s", V.avro4s),
         %("grpc-testing", V.grpc) % Test,
         %%("scalamockScalatest")  % Test
       )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 922ec0ecf..f2417e7f1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeRepo("releases")
-addSbtPlugin("io.frees" % "sbt-freestyle" % "0.3.14")
+addSbtPlugin("io.frees" % "sbt-freestyle" % "0.3.15")
diff --git a/version.sbt b/version.sbt
index ada7f1a42..c92acc8ad 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.6.2-SNAPSHOT"
\ No newline at end of file
+version in ThisBuild := "0.7.0"
\ No newline at end of file