diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,11 +1,33 @@
-# 0.1.0.0
+# ChangeLog for tls-session-manager
 
-- Using ShortByteString internally to avoid ByteString's fragmentation.
-- The default value of dbMaxSize is now 1,000.
+## 0.0.6
 
-# 0.0.1.0
+* Preparing for tls v2.1.
 
-- Supporting sessionResumeOnlyOnce.
+## 0.0.5
 
-# 0.0.0.0
-- A first release.
+* Supporting "tls" v2.0.0.
+
+## 0.0.4
+
+* Supporting "tls" v1.5.3.
+
+## 0.0.3
+
+* Adding Strict and StrictData pragma
+
+## 0.0.2.1
+
+* Supporting "tls" v1.5.0.
+
+## 0.0.2.0
+
+* Using ShortByteString internally to avoid ByteString's fragmentation.
+* The default value of dbMaxSize is now 1,000.
+
+## 0.0.1.0
+
+* Supporting sessionResumeOnlyOnce.
+
+## 0.0.0.0
+* A first release.
diff --git a/Network/TLS/SessionManager.hs b/Network/TLS/SessionManager.hs
--- a/Network/TLS/SessionManager.hs
+++ b/Network/TLS/SessionManager.hs
@@ -53,34 +53,24 @@
 toKey = convert
 
 toValue :: SessionData -> SessionDataCopy
-toValue (SessionData v cid comp msni sec mg mti malpn siz flg) =
-    SessionDataCopy v cid comp msni sec' mg mti malpn' siz flg
-  where
-    sec' = convert sec
-    malpn' = convert <$> malpn
+toValue sd =
+    SessionDataCopy $
+        sd
+            { sessionSecret = convert $ sessionSecret sd
+            , sessionALPN = convert <$> sessionALPN sd
+            }
 
 fromValue :: SessionDataCopy -> SessionData
-fromValue (SessionDataCopy v cid comp msni sec' mg mti malpn' siz flg) =
-    SessionData v cid comp msni sec mg mti malpn siz flg
-  where
-    sec = convert sec'
-    malpn = convert <$> malpn'
+fromValue (SessionDataCopy sd) =
+    sd
+        { sessionSecret = convert $ sessionSecret sd
+        , sessionALPN = convert <$> sessionALPN sd
+        }
 
 ----------------------------------------------------------------
 
 type SessionIDCopy = Block Word8
-data SessionDataCopy
-    = SessionDataCopy
-        {- ssVersion     -} Version
-        {- ssCipher      -} CipherID
-        {- ssCompression -} CompressionID
-        {- ssClientSNI   -} (Maybe HostName)
-        {- ssSecret      -} (Block Word8)
-        {- ssGroup       -} (Maybe Group)
-        {- ssTicketInfo  -} (Maybe TLS13TicketInfo)
-        {- ssALPN        -} (Maybe (Block Word8))
-        {- ssMaxEarlyDataSize -} Int
-        {- ssFlags       -} [SessionFlag]
+newtype SessionDataCopy = SessionDataCopy SessionData
     deriving (Show, Eq)
 
 type Sec = Int64
@@ -108,8 +98,8 @@
                 , reaperNull = Q.null
                 , reaperDelay = pruningDelay conf * 1000000
                 }
-    return
-        SessionManager
+    return $
+        noSessionManager
             { sessionResume = resume reaper MultipleUse
             , sessionResumeOnlyOnce = resume reaper SingleUse
             , sessionEstablish = \x y -> establish reaper lifetime x y >> return Nothing
diff --git a/Network/TLS/SessionTicket.hs b/Network/TLS/SessionTicket.hs
--- a/Network/TLS/SessionTicket.hs
+++ b/Network/TLS/SessionTicket.hs
@@ -52,7 +52,7 @@
 
 sessionTicketManager :: CT.TokenManager -> SessionManager
 sessionTicketManager ctmgr =
-    SessionManager
+    noSessionManager
         { sessionResume = resume ctmgr
         , sessionResumeOnlyOnce = resume ctmgr
         , sessionEstablish = establish ctmgr
diff --git a/tls-session-manager.cabal b/tls-session-manager.cabal
--- a/tls-session-manager.cabal
+++ b/tls-session-manager.cabal
@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               tls-session-manager
-version:            0.0.5
+version:            0.0.6
 license:            BSD3
 license-file:       LICENSE
 maintainer:         kazu@iij.ad.jp
@@ -21,15 +21,15 @@
     ghc-options:      -Wall
     build-depends:
         base >=4.7 && <5,
-        auto-update >= 0.1 && < 0.2,
+        auto-update >= 0.1 && < 0.3,
         basement >= 0.0.16 && < 0.1,
-        bytestring >= 0.10 && < 0.12,
+        bytestring >= 0.10 && < 0.13,
         clock >= 0.8 && < 0.9,
         crypto-token >= 0.1.1 && < 0.2,
         memory >= 0.18.0 && < 0.19,
         psqueues >= 0.2 && < 0.3,
         serialise >= 0.2 && < 0.3,
-        tls >= 2.0 && < 2.1
+        tls >= 2.0 && < 2.2
 
     if impl(ghc >=8)
         default-extensions: Strict StrictData