2 files changed, 15 insertions, 11 deletions
diff --git a/src/twitcr/mappings/token.cr b/src/twitcr/mappings/token.cr
index a141a68..3b9fcd8 100644
--- a/src/twitcr/mappings/token.cr
+++ b/src/twitcr/mappings/token.cr
@@ -1,7 +1,7 @@
 struct Twitcr::Token
-  JSON.mapping({
-    access_token: String,
-    expires_in: Int64,
-    token_type: String
-  })
+  include JSON::Serializable
+
+  property access_token : String
+  property expires_in : Int64
+  property token_type : String
 end
diff --git a/src/twitcr/mappings/user.cr b/src/twitcr/mappings/user.cr
index 6ddd08b..c072549 100644
--- a/src/twitcr/mappings/user.cr
+++ b/src/twitcr/mappings/user.cr
@@ -2,15 +2,19 @@ require "./converters"
 
 module Twitcr
   struct UserList
-    JSON.mapping({data: Array(User)})
+    include JSON::Serializable
+
+    property data : Array(User)
   end
 
   struct User
-    JSON.mapping({
-      id:           {type: UInt64, converter: ID::Converter},
-      login:        String,
-      display_name: String,
-    })
+    include JSON::Serializable
+
+    @[JSON::Field(converter: ID::Converter)]
+    property id : UInt64
+
+    property login : String
+    property display_name : String
   end
 end