diff --git a/src/database.rs b/src/database.rs
index 62c7594..ae137d4 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -1,6 +1,7 @@
 use std::fs;
 use std::io::ErrorKind;
 use std::process::exit;
+use std::collections::HashSet;
 
 use reqwest;
 use rusqlite::{Connection, Transaction, ErrorCode};
@@ -72,14 +73,6 @@ impl WordDb {
             name TINYTEXT UNIQUE NOT NULL
         )", &lang.code), []).unwrap();
 
-        for type_ in &lang.types {
-            transaction.execute(&format!("
-            INSERT INTO {0}_types ( name )
-            VALUES (
-                ?
-            )", &lang.code), [type_]).unwrap();
-        }
-
         transaction.execute(&format!("
         CREATE TABLE {0}_words (
             id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -95,11 +88,6 @@ impl WordDb {
         ON {0}_words (word)
         ", &lang.code), []).unwrap();
 
-        transaction.execute("
-        INSERT INTO langs (code, name, major, minor, patch)
-        VALUES (?, ?, ?, ?, ?)
-        ", params![&lang.code, &lang.name, MAJOR, MINOR, PATCH]).unwrap();
-
         transaction.commit().unwrap();
     }
 
@@ -216,6 +204,37 @@ impl WordDb {
         }
     }
 
+    fn insert_types(&mut self, lang: &Language, entries: &WiktionaryEntries) {
+        let mut conn = self.connect();
+        let transaction = conn.transaction().unwrap();
+
+        let mut types = HashSet::new();
+
+        for entry in entries.iter() {
+            types.insert(&entry.type_);
+        }
+
+        for type_ in types {
+            transaction.execute(&format!("
+            INSERT INTO {0}_types ( name )
+            VALUES (?)", &lang.code), [type_]).unwrap();
+        }
+
+        transaction.commit().unwrap();
+    }
+
+    fn insert_version(&mut self, lang: &Language) {
+        let mut conn = self.connect();
+        let transaction = conn.transaction().unwrap();
+
+        transaction.execute("
+        INSERT INTO langs (code, name, major, minor, patch)
+        VALUES (?, ?, ?, ?, ?)
+        ", params![&lang.code, &lang.name, MAJOR, MINOR, PATCH]).unwrap();
+
+        transaction.commit().unwrap();
+    }
+
     pub async fn upgrade_lang(&mut self, lang: &Language) {
         self.try_create_dir(DB_DIR);
 
@@ -251,12 +270,18 @@ impl WordDb {
         println!("Parsing data...");
         let entries = WiktionaryEntries::parse_data(data);
 
-        println!("Inserting data...");
+        println!("Inserting types...");
+        self.insert_types(lang, &entries);
+
+        println!("Inserting entries...");
         self.insert_entries(lang, &entries);
 
         println!("Generating \"form-of\" entries...");
         self.generate_entries(lang, &entries);
 
+        println!("Inserting version...");
+        self.insert_version(lang);
+
         println!("Done");
     }
 }
diff --git a/src/language.rs b/src/language.rs
index ef4fedf..9c61853 100644
--- a/src/language.rs
+++ b/src/language.rs
@@ -1,16 +1,14 @@
 #[derive(Debug)]
 pub struct Language {
     pub code: String,
-    pub name: String,
-    pub types: Vec<String>
+    pub name: String
 }
 
 impl Language {
-    pub fn new(code: &str, name: &str, types: Vec<String>) -> Self {
+    pub fn new(code: &str, name: &str) -> Self {
         Self {
             code: String::from(code),
-            name: String::from(name),
-            types
+            name: String::from(name)
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 4c2eb23..29c88fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -56,30 +56,7 @@ async fn main() {
 
     let mut db = WordDb::new("inflectived.db");
 
-    let lang = Language::new("pl",
-                             "Polish",
-                             vec![String::from("adj"),
-                                  String::from("noun"),
-                                  String::from("verb"),
-                                  String::from("character"),
-                                  String::from("suffix"),
-                                  String::from("prefix"),
-                                  String::from("conj"),
-                                  String::from("adv"),
-                                  String::from("infix"),
-                                  String::from("name"),
-                                  String::from("phrase"),
-                                  String::from("prep_phrase"),
-                                  String::from("intj"),
-                                  String::from("det"),
-                                  String::from("prep"),
-                                  String::from("proverb"),
-                                  String::from("abbrev"),
-                                  String::from("num"),
-                                  String::from("pron"),
-                                  String::from("punct"),
-                                  String::from("interfix"),
-                                  String::from("particle")]);
+    let lang = Language::new("pl", "Polish");
 
     match matches.subcommand() {
         ("upgrade", _) => { db.upgrade_lang(&lang).await; },