diff --git a/app/blueprints/api/v1/character_blueprint.rb b/app/blueprints/api/v1/character_blueprint.rb
index d47bde7..0a5e67d 100644
--- a/app/blueprints/api/v1/character_blueprint.rb
+++ b/app/blueprints/api/v1/character_blueprint.rb
@@ -20,22 +20,6 @@ module Api
         }
       end
 
-      field :hp do |w|
-        {
-          min_hp: w.min_hp,
-          max_hp: w.max_hp,
-          max_hp_flb: w.max_hp_flb
-        }
-      end
-
-      field :atk do |w|
-        {
-          min_atk: w.min_atk,
-          max_atk: w.max_atk,
-          max_atk_flb: w.max_atk_flb
-        }
-      end
-
       field :race do |w|
         [
           w.race1,
@@ -50,17 +34,28 @@ module Api
         ]
       end
 
-      field :data do |w|
+      field :stats do |w|
         {
-          base_da: w.base_da,
-          base_ta: w.base_ta
-        }
-      end
-
-      field :ougi_ratio do |w|
-        {
-          ougi_ratio: w.ougi_ratio,
-          ougi_ratio_flb: w.ougi_ratio_flb
+          atk: {
+            min_atk: w.min_atk,
+            max_atk: w.max_atk,
+            max_atk_flb: w.max_atk_flb,
+            max_atk_ulb: w.max_atk_ulb
+          },
+          hp: {
+            min_hp: w.min_hp,
+            max_hp: w.max_hp,
+            max_hp_flb: w.max_hp_flb,
+            max_hp_ulb: w.max_hp_ulb
+          },
+          data: {
+            base_da: w.base_da,
+            base_ta: w.base_ta
+          },
+          charge_attack: {
+            ougi_ratio: w.ougi_ratio,
+            ougi_ratio_flb: w.ougi_ratio_flb
+          }
         }
       end
     end
diff --git a/app/blueprints/api/v1/job_blueprint.rb b/app/blueprints/api/v1/job_blueprint.rb
index fe9a079..a27c0fb 100644
--- a/app/blueprints/api/v1/job_blueprint.rb
+++ b/app/blueprints/api/v1/job_blueprint.rb
@@ -17,7 +17,7 @@ module Api
         ]
       end
 
-      fields :granblue_id, :row, :ml, :order, :accessory, :accessory_type
+      fields :granblue_id, :row, :master_level, :ultimate_mastery, :order, :accessory, :accessory_type
     end
   end
 end
diff --git a/app/blueprints/api/v1/party_blueprint.rb b/app/blueprints/api/v1/party_blueprint.rb
index 61bb005..2645e64 100644
--- a/app/blueprints/api/v1/party_blueprint.rb
+++ b/app/blueprints/api/v1/party_blueprint.rb
@@ -52,6 +52,7 @@ module Api
       end
 
       view :jobs do
+        fields :master_level, :ultimate_mastery
         association :job,
                     blueprint: JobBlueprint
         include_view :job_skills
diff --git a/app/blueprints/api/v1/summon_blueprint.rb b/app/blueprints/api/v1/summon_blueprint.rb
index 7c9b84a..343d371 100644
--- a/app/blueprints/api/v1/summon_blueprint.rb
+++ b/app/blueprints/api/v1/summon_blueprint.rb
@@ -10,7 +10,7 @@ module Api
         }
       end
 
-      fields :granblue_id, :element, :rarity, :max_level
+      fields :granblue_id, :element, :rarity
 
       field :uncap do |w|
         {
@@ -20,23 +20,23 @@ module Api
         }
       end
 
-      field :hp do |w|
+      field :stats do |w|
         {
-          min_hp: w.min_hp,
-          max_hp: w.max_hp,
-          max_hp_flb: w.max_hp_flb,
-          max_hp_ulb: w.max_hp_ulb,
-          max_hp_xlb: w.max_hp_xlb
-        }
-      end
-
-      field :atk do |w|
-        {
-          min_atk: w.min_atk,
-          max_atk: w.max_atk,
-          max_atk_flb: w.max_atk_flb,
-          max_atk_ulb: w.max_atk_ulb,
-          max_atk_xlb: w.max_atk_xlb
+          atk: {
+            min_atk: w.min_atk,
+            max_atk: w.max_atk,
+            max_atk_flb: w.max_atk_flb,
+            max_atk_ulb: w.max_atk_ulb,
+            max_atk_xlb: w.max_atk_xlb
+          },
+          hp: {
+            min_hp: w.min_hp,
+            max_hp: w.max_hp,
+            max_hp_flb: w.max_hp_flb,
+            max_hp_ulb: w.max_hp_ulb,
+            max_hp_xlb: w.max_hp_xlb
+          },
+          max_level: w.max_level,
         }
       end
     end
diff --git a/app/blueprints/api/v1/weapon_blueprint.rb b/app/blueprints/api/v1/weapon_blueprint.rb
index d7701e1..d1d92d9 100644
--- a/app/blueprints/api/v1/weapon_blueprint.rb
+++ b/app/blueprints/api/v1/weapon_blueprint.rb
@@ -11,8 +11,21 @@ module Api
       end
 
       fields :granblue_id, :element, :proficiency,
-             :max_level, :max_skill_level, :limit, :rarity,
-             :series, :ax, :ax_type, :awakening
+             :limit, :rarity, :series
+
+      field :ax do |w|
+        {
+          has_ax: w.ax,
+          type: w.ax_type
+        }
+      end
+
+      field :awakening do |w|
+        {
+          has_awakening: w.awakening,
+          types: w.awakening_types
+        }
+      end
 
       field :uncap do |w|
         {
@@ -21,21 +34,22 @@ module Api
         }
       end
 
-      field :hp do |w|
+      field :stats do |w|
         {
-          min_hp: w.min_hp,
-          max_hp: w.max_hp,
-          max_hp_flb: w.max_hp_flb,
-          max_hp_ulb: w.max_hp_ulb
-        }
-      end
-
-      field :atk do |w|
-        {
-          min_atk: w.min_atk,
-          max_atk: w.max_atk,
-          max_atk_flb: w.max_atk_flb,
-          max_atk_ulb: w.max_atk_ulb
+          atk: {
+            min_atk: w.min_atk,
+            max_atk: w.max_atk,
+            max_atk_flb: w.max_atk_flb,
+            max_atk_ulb: w.max_atk_ulb
+          },
+          hp: {
+            min_hp: w.min_hp,
+            max_hp: w.max_hp,
+            max_hp_flb: w.max_hp_flb,
+            max_hp_ulb: w.max_hp_ulb
+          },
+          max_level: w.max_level,
+          max_skill_level: w.max_skill_level
         }
       end
     end