diff --git a/db/migrate/20230107150547_change_awakening_columns_to_jsonb.rb b/db/migrate/20230107150547_change_awakening_columns_to_jsonb.rb
new file mode 100644
index 0000000..3a48821
--- /dev/null
+++ b/db/migrate/20230107150547_change_awakening_columns_to_jsonb.rb
@@ -0,0 +1,10 @@
+class ChangeAwakeningColumnsToJsonb < ActiveRecord::Migration[7.0]
+  def change
+    # Remove old columns
+    remove_column :grid_characters, :awakening_type, :integer
+    remove_column :grid_characters, :awakening_level, :integer
+
+    # Add new column
+    add_column :grid_characters, :awakening, :jsonb, default: { type: 1, level: 1 }
+  end
+end
diff --git a/db/migrate/20230107153724_make_mastery_columns_not_nullable.rb b/db/migrate/20230107153724_make_mastery_columns_not_nullable.rb
new file mode 100644
index 0000000..976ca5a
--- /dev/null
+++ b/db/migrate/20230107153724_make_mastery_columns_not_nullable.rb
@@ -0,0 +1,10 @@
+class MakeMasteryColumnsNotNullable < ActiveRecord::Migration[7.0]
+  def change
+    change_column :grid_characters, :ring1, :jsonb, null: false
+    change_column :grid_characters, :ring2, :jsonb, null: false
+    change_column :grid_characters, :ring3, :jsonb, null: false
+    change_column :grid_characters, :ring4, :jsonb, null: false
+    change_column :grid_characters, :earring, :jsonb, null: false
+    change_column :grid_characters, :awakening, :jsonb, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e6a1429..4cea1cb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_01_07_121520) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_07_153724) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "pg_trgm"
@@ -67,14 +67,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_07_121520) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "perpetuity", default: false, null: false
-    t.integer "awakening_type", default: 1, null: false
-    t.integer "awakening_level", default: 1, null: false
     t.integer "transcendence_step", default: 0, null: false
-    t.jsonb "ring1", default: {"modifier"=>nil, "strength"=>nil}
-    t.jsonb "ring2", default: {"modifier"=>nil, "strength"=>nil}
-    t.jsonb "ring3", default: {"modifier"=>nil, "strength"=>nil}
-    t.jsonb "ring4", default: {"modifier"=>nil, "strength"=>nil}
-    t.jsonb "earring", default: {"modifier"=>nil, "strength"=>nil}
+    t.jsonb "ring1", default: {"modifier"=>nil, "strength"=>nil}, null: false
+    t.jsonb "ring2", default: {"modifier"=>nil, "strength"=>nil}, null: false
+    t.jsonb "ring3", default: {"modifier"=>nil, "strength"=>nil}, null: false
+    t.jsonb "ring4", default: {"modifier"=>nil, "strength"=>nil}, null: false
+    t.jsonb "earring", default: {"modifier"=>nil, "strength"=>nil}, null: false
+    t.jsonb "awakening", default: {"type"=>1, "level"=>1}, null: false
     t.index ["character_id"], name: "index_grid_characters_on_character_id"
     t.index ["party_id"], name: "index_grid_characters_on_party_id"
   end