1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala
index 67bf8e4..6f772f3 100644
--- a/src/main/scala/xyz/driver/core/json.scala
+++ b/src/main/scala/xyz/driver/core/json.scala
@@ -18,16 +18,11 @@ import xyz.driver.core.time.Time
 object json {
   import DefaultJsonProtocol._
 
-  def IdInPath[T]: PathMatcher1[Id[T]] = new PathMatcher1[Id[T]] {
-    def apply(path: Path) = path match {
-      case Path.Segment(segment, tail) => Matched(tail, Tuple1(Id[T](segment)))
-      case _                           => Unmatched
-    }
-  }
+  private def UuidInPath[T]: PathMatcher1[Id[T]] = PathMatchers.JavaUUID.map((id: UUID) => Id[T](id.toString))
 
-  def UuidInPath[T]: PathMatcher1[Id[T]] = new PathMatcher1[Id[T]] {
+  def IdInPath[T]: PathMatcher1[Id[T]] = UuidInPath[T] | new PathMatcher1[Id[T]] {
     def apply(path: Path) = path match {
-      case Path.Segment(segment, tail) => Matched(tail, Tuple1(Id[T](UUID.fromString(segment).toString)))
+      case Path.Segment(segment, tail) => Matched(tail, Tuple1(Id[T](segment)))
       case _                           => Unmatched
     }
   }