diff --git a/Cargo.toml b/Cargo.toml
index 742fcce1..df9e2b79 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,8 +35,7 @@ sea-query = { version = "^0.12" }
 sea-orm-macros = { path = "sea-orm-macros", optional = true }
 serde = { version = "^1.0", features = [ "derive" ] }
 sqlx = { version = "^0.5", optional = true }
-# strum = { path = "../strum/strum", version = "^0.21", features = [ "derive" ] }
-strum = { git = "https://github.com/billy1624/strum.git", branch = "re-export-macros", version = "^0.21", features = [ "derive" ] }
+strum = { git = "https://github.com/SeaQL/strum.git", branch = "sea-orm", version = "^0.21", features = [ "derive", "sea-orm" ] }
 serde_json = { version = "^1", optional = true }
 
 [dev-dependencies]
diff --git a/examples/sqlx-mysql/Cargo.toml b/examples/sqlx-mysql/Cargo.toml
index ae622523..4b39809c 100644
--- a/examples/sqlx-mysql/Cargo.toml
+++ b/examples/sqlx-mysql/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 async-std = { version = "^1.9", features = [ "attributes" ] }
-sea-orm = { path = "../../", features = [ "sqlx-mysql", "runtime-async-std-native-tls", "debug-print", "with-json", "macros" ], default-features = false }
+sea-orm = { path = "../../", features = [ "sqlx-mysql", "runtime-async-std-native-tls", "debug-print", "sqlx-json", "macros" ], default-features = false }
 serde_json = { version = "^1" }
 futures = { version = "^0.3" }
 async-stream = { version = "^0.3" }
diff --git a/examples/sqlx-mysql/src/example_cake.rs b/examples/sqlx-mysql/src/example_cake.rs
index 714bb19a..475315e8 100644
--- a/examples/sqlx-mysql/src/example_cake.rs
+++ b/examples/sqlx-mysql/src/example_cake.rs
@@ -16,14 +16,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -35,7 +33,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Fruit,
 }
diff --git a/examples/sqlx-mysql/src/example_cake_filling.rs b/examples/sqlx-mysql/src/example_cake_filling.rs
index f38555a1..19de83e4 100644
--- a/examples/sqlx-mysql/src/example_cake_filling.rs
+++ b/examples/sqlx-mysql/src/example_cake_filling.rs
@@ -16,14 +16,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     CakeId,
     FillingId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     CakeId,
     FillingId,
@@ -36,7 +34,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
     Filling,
diff --git a/examples/sqlx-mysql/src/example_filling.rs b/examples/sqlx-mysql/src/example_filling.rs
index b8e40072..925b92fc 100644
--- a/examples/sqlx-mysql/src/example_filling.rs
+++ b/examples/sqlx-mysql/src/example_filling.rs
@@ -16,14 +16,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -35,7 +33,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {}
 
 impl ColumnTrait for Column {
diff --git a/examples/sqlx-mysql/src/example_fruit.rs b/examples/sqlx-mysql/src/example_fruit.rs
index ced70c88..b875da24 100644
--- a/examples/sqlx-mysql/src/example_fruit.rs
+++ b/examples/sqlx-mysql/src/example_fruit.rs
@@ -17,7 +17,6 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
@@ -25,7 +24,6 @@ pub enum Column {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -37,7 +35,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
 }
diff --git a/src/tests_cfg/cake.rs b/src/tests_cfg/cake.rs
index 8332111b..f8a35d6c 100644
--- a/src/tests_cfg/cake.rs
+++ b/src/tests_cfg/cake.rs
@@ -17,14 +17,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -36,7 +34,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Fruit,
 }
diff --git a/src/tests_cfg/cake_filling.rs b/src/tests_cfg/cake_filling.rs
index c3a66023..6b5c20aa 100644
--- a/src/tests_cfg/cake_filling.rs
+++ b/src/tests_cfg/cake_filling.rs
@@ -17,14 +17,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     CakeId,
     FillingId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     CakeId,
     FillingId,
@@ -37,7 +35,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
     Filling,
diff --git a/src/tests_cfg/filling.rs b/src/tests_cfg/filling.rs
index 8f572436..a246d146 100644
--- a/src/tests_cfg/filling.rs
+++ b/src/tests_cfg/filling.rs
@@ -17,14 +17,12 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -36,7 +34,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {}
 
 impl ColumnTrait for Column {
diff --git a/src/tests_cfg/fruit.rs b/src/tests_cfg/fruit.rs
index 67d1d07e..0511ae58 100644
--- a/src/tests_cfg/fruit.rs
+++ b/src/tests_cfg/fruit.rs
@@ -18,7 +18,6 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
@@ -26,7 +25,6 @@ pub enum Column {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -38,7 +36,6 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
-#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
 }