diff --git a/lib/rails/generators/mobility/templates/create_string_translations.rb b/lib/rails/generators/mobility/templates/create_string_translations.rb
index 1cf1fc68a..2d6cf565b 100644
--- a/lib/rails/generators/mobility/templates/create_string_translations.rb
+++ b/lib/rails/generators/mobility/templates/create_string_translations.rb
@@ -2,12 +2,11 @@ class CreateStringTranslations < <%= activerecord_migration_class %>
 
   def change
     create_table :mobility_string_translations do |t|
-      t.string  :locale,            null: false
-      t.string  :key,               null: false
-      t.string  :value
-      t.integer :translatable_id,   null: false
-      t.string  :translatable_type, null: false
-      t.timestamps                  null: false
+      t.string :locale, null: false
+      t.string :key, null: false
+      t.string :value
+      t.references :translatable, polymorphic: true, index: false
+      t.timestamps null: false
     end
     add_index :mobility_string_translations, [:translatable_id, :translatable_type, :locale, :key], unique: true, name: :index_mobility_string_translations_on_keys
     add_index :mobility_string_translations, [:translatable_id, :translatable_type, :key], name: :index_mobility_string_translations_on_translatable_attribute
diff --git a/lib/rails/generators/mobility/templates/create_text_translations.rb b/lib/rails/generators/mobility/templates/create_text_translations.rb
index e7c914ec1..c74eda4a2 100644
--- a/lib/rails/generators/mobility/templates/create_text_translations.rb
+++ b/lib/rails/generators/mobility/templates/create_text_translations.rb
@@ -2,12 +2,11 @@ class CreateTextTranslations < <%= activerecord_migration_class %>
 
   def change
     create_table :mobility_text_translations do |t|
-      t.string  :locale,            null: false
-      t.string  :key,               null: false
-      t.text    :value
-      t.integer :translatable_id,   null: false
-      t.string  :translatable_type, null: false
-      t.timestamps                  null: false
+      t.string :locale, null: false
+      t.string :key,    null: false
+      t.text :value
+      t.references :translatable, polymorphic: true, index: false
+      t.timestamps null: false
     end
     add_index :mobility_text_translations, [:translatable_id, :translatable_type, :locale, :key], unique: true, name: :index_mobility_text_translations_on_keys
     add_index :mobility_text_translations, [:translatable_id, :translatable_type, :key], name: :index_mobility_text_translations_on_translatable_attribute
diff --git a/spec/generators/rails/mobility/install_generator_spec.rb b/spec/generators/rails/mobility/install_generator_spec.rb
index d5d037d23..9956e8cfb 100644
--- a/spec/generators/rails/mobility/install_generator_spec.rb
+++ b/spec/generators/rails/mobility/install_generator_spec.rb
@@ -44,7 +44,8 @@
               end
               contains "def change"
               contains "create_table :mobility_text_translations"
-              contains "t.text    :value"
+              contains "t.text :value"
+              contains "t.references :translatable, polymorphic: true, index: false"
               contains "add_index :mobility_text_translations"
               contains "name: :index_mobility_text_translations_on_keys"
               contains "name: :index_mobility_text_translations_on_translatable_attribute"
@@ -68,7 +69,8 @@
               end
               contains "def change"
               contains "create_table :mobility_string_translations"
-              contains "t.string  :value"
+              contains "t.string :value"
+              contains "t.references :translatable, polymorphic: true, index: false"
               contains "add_index :mobility_string_translations"
               contains "name: :index_mobility_string_translations_on_keys"
               contains "name: :index_mobility_string_translations_on_translatable_attribute"