diff --git a/hist-pl.cabal b/hist-pl.cabal
--- a/hist-pl.cabal
+++ b/hist-pl.cabal
@@ -1,5 +1,5 @@
 name:               hist-pl
-version:            0.2.1
+version:            0.3.0
 synopsis:           Umbrella package for the historical dictionary of Polish
 description:
     The package provides a tool for creating and searching the
@@ -22,7 +22,7 @@
                     , containers
                     , text
                     , aeson >= 0.6 && < 0.7
-                    , hist-pl-lexicon >= 0.4 && < 0.5
+                    , hist-pl-lexicon >= 0.5 && < 0.6
                     , hist-pl-transliter >= 0.1 && < 0.2
                     , morfeusz >= 0.4 && < 0.5
 
@@ -35,8 +35,10 @@
                     , bytestring
                     , aeson-pretty >= 0.7 && < 0.8
                     , polimorf >= 0.7.1 && < 0.8
-                    , hist-pl-lexicon >= 0.4 && < 0.5
-                    , hist-pl-fusion >= 0.4 && < 0.5
+                    , hist-pl-lexicon >= 0.5 && < 0.6
+                    , hist-pl-fusion >= 0.5 && < 0.6
+                    , hist-pl-dawg >= 0.1 && < 0.2
+                    , hist-pl-lmf >= 0.1 && < 0.2
 
 source-repository head
     type: git
diff --git a/src/NLP/HistPL/Analyse.hs b/src/NLP/HistPL/Analyse.hs
--- a/src/NLP/HistPL/Analyse.hs
+++ b/src/NLP/HistPL/Analyse.hs
@@ -124,9 +124,9 @@
 
 -- | When contemporary interpretations should be shown.
 data ShowCont
-    = NoShowCont
-    | ShowCont
-    | ForceShowCont
+    = NoShowCont    -- ^ Never
+    | ShowCont      -- ^ When no historical interpretation
+    | ForceShowCont -- ^ Alwas
     deriving (Show, Eq, Ord)
 
 
@@ -180,7 +180,7 @@
 -- | JSON represesentation of a historical interpretation.
 jsonHist :: JConf -> (H.LexEntry, H.Code) -> Value
 jsonHist jc (entry, code) = object $
-    [ "id"   .= jsonID (H.lexId entry, code)
+    [ "id"   .= jsonID (H.lexID entry, code)
     , "pos"  .= H.pos entry
     , "base" .= H.text (H.lemma entry) ]
     ++ if showDefs jc then [defsElem] else []
diff --git a/tools/hist-pl.hs b/tools/hist-pl.hs
--- a/tools/hist-pl.hs
+++ b/tools/hist-pl.hs
@@ -18,7 +18,7 @@
 
 import qualified Data.PoliMorf as P
 import qualified NLP.HistPL.LMF as LMF
-import qualified NLP.HistPL.Dict as D
+import qualified NLP.HistPL.DAWG as D
 import qualified NLP.HistPL.Lexicon as H
 import qualified NLP.HistPL.Fusion as F
 import qualified NLP.HistPL.Analyse as A
@@ -80,8 +80,8 @@
     , compact = False &= help "Compact JSON output"
     , printCont = 1 &= (help . unwords)
         [ "Printing contemporary interpretations:"
-        , "0 -- never, 1 -- when no hist (default), 2 -- always" ]
-    , printDefs = False &= help "Print definitions" }
+        , "0 -- never, 1 -- when no hist (default), 2 -- always." ]
+    , printDefs = False &= help "Print definitions." }
 
 
 argModes :: Mode (CmdArgs HistPL)
@@ -107,7 +107,7 @@
     -- putStrLn "Reading historical dictionary of Polish..."
     hist <- LMF.readLMF lmfPath
     -- putStrLn "Creating the binary version of the dictionary..."
-    void $ H.save outPath (addForms poli hist)
+    void $ H.build outPath (addForms poli hist)
   where
     addForms poli hist =
         [ ( lexEntry
@@ -121,7 +121,7 @@
 
 exec Print{..} = do
     hpl <- H.open binPath
-    H.load hpl >>= L.putStr . LMF.showLMF . map snd
+    H.loadAll hpl >>= L.putStr . LMF.showLMF . map snd
 
 
 exec Analyse{..} = do