diff --git a/Biobase/Turner.hs b/Biobase/Turner.hs
--- a/Biobase/Turner.hs
+++ b/Biobase/Turner.hs
@@ -60,7 +60,7 @@
   , _dangle5            :: !(Unboxed PN e)
   , _hairpinL           :: !(VU.Vector e)
   , _hairpinMM          :: !(Unboxed PNN e)
-  , _hairpinLookup      :: !(M.Map ByteString e)
+  , _hairpinLookup      :: !(M.Map Primary e)
   , _hairpinGGG         :: !e
   , _hairpinCslope      :: !e
   , _hairpinCintercept  :: !e
diff --git a/Biobase/Turner/Import.hs b/Biobase/Turner/Import.hs
--- a/Biobase/Turner/Import.hs
+++ b/Biobase/Turner/Import.hs
@@ -238,8 +238,8 @@
 
 -- |
 
-tabFromFile :: FilePath -> IO [(ByteString,Energy)]
-tabFromFile fp = runResourceT $ sourceFile fp $$ parseTabulated
+tabFromFile :: FilePath -> IO [(Primary,Energy)]
+tabFromFile fp = fmap (L.map (first mkPrimary)) . runResourceT $ sourceFile fp $$ parseTabulated
 
 allEq [] = True
 allEq (x:xs) = L.all (==x) xs
diff --git a/BiobaseTurner.cabal b/BiobaseTurner.cabal
--- a/BiobaseTurner.cabal
+++ b/BiobaseTurner.cabal
@@ -1,5 +1,5 @@
 name:           BiobaseTurner
-version:        0.3.0.0
+version:        0.3.1.0
 author:         Christian Hoener zu Siederdissen
 maintainer:     choener@tbi.univie.ac.at
 homepage:       http://www.tbi.univie.ac.at/~choener/