diff --git a/app/views/api/v1/grid_characters/base.json.rabl b/app/views/api/v1/grid_characters/base.json.rabl
index d535843..74e9ec1 100644
--- a/app/views/api/v1/grid_characters/base.json.rabl
+++ b/app/views/api/v1/grid_characters/base.json.rabl
@@ -1,7 +1,8 @@
 attributes :id,
     :party_id,
     :position,
-    :uncap_level
+    :uncap_level,
+    :perpetuity
 
 node :object do |c|
     partial("characters/base", :object => c.character)
diff --git a/app/views/api/v1/grid_weapons/base.json.rabl b/app/views/api/v1/grid_weapons/base.json.rabl
index 4956934..36b5c87 100644
--- a/app/views/api/v1/grid_weapons/base.json.rabl
+++ b/app/views/api/v1/grid_weapons/base.json.rabl
@@ -2,8 +2,26 @@ attributes :id,
     :party_id,
     :mainhand,
     :position,
-    :uncap_level
+    :uncap_level,
+    :element
 
 node :object do |w|
     partial("weapons/base", :object => w.weapon)
+end
+
+node :weapon_keys, :if => lambda { |w| [2, 3, 17, 22].include?(w.weapon.series) } do |w|
+    partial("weapon_keys/base", :object => w.weapon_keys)
+end
+
+node :ax, :if => lambda { |w| w.weapon.ax > 0 } do |w|
+    [
+        {
+            :modifier => w.ax_modifier1,
+            :strength => w.ax_strength1
+        },
+        {
+            :modifier => w.ax_modifier2,
+            :strength => w.ax_strength2
+        }
+    ]
 end
\ No newline at end of file
diff --git a/app/views/api/v1/weapon_keys/all.json.rabl b/app/views/api/v1/weapon_keys/all.json.rabl
new file mode 100644
index 0000000..f631ea6
--- /dev/null
+++ b/app/views/api/v1/weapon_keys/all.json.rabl
@@ -0,0 +1,3 @@
+collection @keys
+
+extends 'weapon_keys/base'
diff --git a/app/views/api/v1/weapon_keys/base.json.rabl b/app/views/api/v1/weapon_keys/base.json.rabl
new file mode 100644
index 0000000..84a6c6c
--- /dev/null
+++ b/app/views/api/v1/weapon_keys/base.json.rabl
@@ -0,0 +1,10 @@
+object :weapon_key
+
+attributes :id, :series, :slot, :group
+
+node :name do |k|
+    {
+        :en => k.name_en,
+        :jp => k.name_jp
+    }
+end
\ No newline at end of file
diff --git a/app/views/api/v1/weapons/base.json.rabl b/app/views/api/v1/weapons/base.json.rabl
index 64dd42b..d8384f4 100644
--- a/app/views/api/v1/weapons/base.json.rabl
+++ b/app/views/api/v1/weapons/base.json.rabl
@@ -5,7 +5,11 @@ attributes :id,
     :element,
     :proficiency,
     :max_level,
-    :max_skill_level
+    :max_skill_level,
+    :limit,
+    :rarity,
+    :series,
+    :ax
 
 node :name do |w|
     {