diff --git a/csv-query-cli/Cargo.toml b/csv-query-cli/Cargo.toml
index 8104a8f..9100ec9 100644
--- a/csv-query-cli/Cargo.toml
+++ b/csv-query-cli/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.5.0"
 description = "Make SQL queries on CSV files (cli)"
 license = "MIT"
 readme = "../README.md"
+edition = "2018"
 
 authors = ["Jayson Reis <santosdosreis@gmail.com>"]
 
diff --git a/csv-query-cli/src/main.rs b/csv-query-cli/src/main.rs
index c764fb7..2873f6b 100644
--- a/csv-query-cli/src/main.rs
+++ b/csv-query-cli/src/main.rs
@@ -1,10 +1,4 @@
-extern crate clap;
-extern crate directories;
-#[macro_use]
-extern crate error_chain;
-extern crate rustyline;
-
-extern crate csv_query;
+use error_chain::quick_main;
 
 mod arguments;
 mod interactive;
diff --git a/csv-query-cli/src/process.rs b/csv-query-cli/src/process.rs
index 87f2c1e..a6741a0 100644
--- a/csv-query-cli/src/process.rs
+++ b/csv-query-cli/src/process.rs
@@ -1,11 +1,13 @@
 use std::fs::File;
 use std::io;
 
+use error_chain::bail;
+
 use csv_query::errors::{Result, ResultExt};
 use csv_query::Executor;
 
-use arguments;
-use interactive::run_interactive;
+use crate::arguments;
+use crate::interactive::run_interactive;
 
 pub(crate) fn process() -> Result<()> {
     let matches = arguments::build().get_matches();
diff --git a/csv-query/Cargo.toml b/csv-query/Cargo.toml
index 477b870..5408078 100644
--- a/csv-query/Cargo.toml
+++ b/csv-query/Cargo.toml
@@ -5,6 +5,7 @@ description = "Make SQL queries on CSV files"
 version = "0.5.0"
 license = "MIT"
 readme = "../README.md"
+edition = "2018"
 
 [dependencies]
 csv = "^1.0.0"
diff --git a/csv-query/src/errors.rs b/csv-query/src/errors.rs
index 0c6d43c..21ca1c2 100644
--- a/csv-query/src/errors.rs
+++ b/csv-query/src/errors.rs
@@ -1 +1,8 @@
-error_chain!{}
+// TODO: Remove these imports after https://github.com/rust-lang-nursery/error-chain/pull/253 is released
+use error_chain::error_chain;
+use error_chain::error_chain_processing;
+use error_chain::impl_error_chain_kind;
+use error_chain::impl_error_chain_processed;
+use error_chain::impl_extract_backtrace;
+
+error_chain! {}
diff --git a/csv-query/src/executor.rs b/csv-query/src/executor.rs
index 7923daf..cbb57fc 100644
--- a/csv-query/src/executor.rs
+++ b/csv-query/src/executor.rs
@@ -4,9 +4,9 @@ use std::path::Path;
 use csv;
 use rusqlite;
 
-use csv_utils::string_to_csv_output;
-use db_utils::{escape_columns, escape_values, AllString};
-use errors::{Result, ResultExt};
+use crate::csv_utils::string_to_csv_output;
+use crate::db_utils::{escape_columns, escape_values, AllString};
+use crate::errors::{Result, ResultExt};
 
 /// Main struct that parses the CSV and put the data into a SQLite
 pub struct Executor<W: Write> {
diff --git a/csv-query/src/lib.rs b/csv-query/src/lib.rs
index 88a844c..b0ce3bc 100644
--- a/csv-query/src/lib.rs
+++ b/csv-query/src/lib.rs
@@ -1,11 +1,6 @@
-extern crate csv;
-#[macro_use]
-extern crate error_chain;
-extern crate rusqlite;
-
 mod csv_utils;
 mod db_utils;
 pub mod errors;
 pub mod executor;
 
-pub use executor::Executor;
+pub use crate::executor::Executor;
diff --git a/csv-query/tests/executor.rs b/csv-query/tests/executor.rs
index fb7c9ad..f3b4cb1 100644
--- a/csv-query/tests/executor.rs
+++ b/csv-query/tests/executor.rs
@@ -1,5 +1,3 @@
-extern crate csv_query;
-
 use std::io::{BufReader, Cursor, Write};
 
 use csv_query::Executor;
@@ -47,7 +45,8 @@ fn test_join() {
                         on u.user = o.user
                     group by u.user
                     having sum(price) > 50",
-            ).unwrap();
+            )
+            .unwrap();
     }
     let output = output_buffer.into_inner();
     assert_eq!(