diff --git a/isomorphism-class.cabal b/isomorphism-class.cabal
--- a/isomorphism-class.cabal
+++ b/isomorphism-class.cabal
@@ -1,7 +1,9 @@
 cabal-version: 3.0
 name:          isomorphism-class
-version:       0.1.0.10
+version:       0.1.0.11
 synopsis:      Isomorphism typeclass solving the conversion problem
+description:   Lawful typeclass for lossless conversion between types.
+category:      Conversion
 homepage:      https://github.com/nikita-volkov/isomorphism-class
 bug-reports:   https://github.com/nikita-volkov/isomorphism-class/issues
 author:        Nikita Volkov <nikita.y.volkov@mail.ru>
@@ -40,7 +42,7 @@
     , containers >=0.6 && <0.7
     , hashable >=1 && <2
     , primitive >=0.7.3 && <0.10
-    , text >=1.2 && <3
+    , text >=1.2 && <2.2
     , unordered-containers >=0.2 && <0.3
     , vector >=0.12 && <0.14
 
@@ -51,7 +53,7 @@
   main-is:        Main.hs
   other-modules:  Test.ExtraInstances
   build-depends:
-    , bytestring >=0.10 && <0.12
+    , bytestring >=0.11.1.0 && <0.12
     , isomorphism-class
     , primitive >=0.7.3 && <0.10
     , QuickCheck >=2.13 && <3
diff --git a/library/IsomorphismClass.hs b/library/IsomorphismClass.hs
--- a/library/IsomorphismClass.hs
+++ b/library/IsomorphismClass.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 
 -- |
@@ -117,12 +118,14 @@
 import qualified Data.Primitive.ByteArray as PrimitiveByteArray
 import qualified Data.Sequence as Seq
 import qualified Data.Text as Text
-import qualified Data.Text.Array as TextArray
 import qualified Data.Text.Lazy as TextLazy
 import qualified Data.Text.Lazy.Builder as TextLazyBuilder
 import qualified Data.Vector as Vector
 import IsomorphismClass.Prelude
+#if !MIN_VERSION_text(2,1,0)
+import qualified Data.Text.Array as TextArray
 import qualified IsomorphismClass.TextCompat.Array as TextCompatArray
+#endif
 
 -- | Bidirectional conversion between two types with no loss of information.
 -- The bidirectionality is encoded via a recursive dependency with arguments
@@ -197,8 +200,10 @@
 instance IsomorphicTo [Word8] PrimitiveByteArray.ByteArray where
   to = toList
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo [Word8] TextArray.Array where
   to = to . to @ByteStringShort.ShortByteString
+#endif
 
 --
 
@@ -276,8 +281,10 @@
 instance IsomorphicTo ByteString PrimitiveByteArray.ByteArray where
   to = to . to @ByteStringShort.ShortByteString
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo ByteString TextArray.Array where
   to = to . to @ByteStringShort.ShortByteString
+#endif
 
 --
 
@@ -299,8 +306,10 @@
 instance IsomorphicTo ByteStringLazy.ByteString PrimitiveByteArray.ByteArray where
   to = to . to @ByteStringShort.ShortByteString
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo ByteStringLazy.ByteString TextArray.Array where
   to = to . to @ByteStringShort.ShortByteString
+#endif
 
 --
 
@@ -322,8 +331,10 @@
 instance IsomorphicTo ByteStringShort.ShortByteString PrimitiveByteArray.ByteArray where
   to (PrimitiveByteArray.ByteArray array) = ByteStringShortInternal.SBS array
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo ByteStringShort.ShortByteString TextArray.Array where
   to a = ByteStringShortInternal.SBS (TextCompatArray.toUnliftedByteArray a)
+#endif
 
 --
 
@@ -345,8 +356,10 @@
 instance IsomorphicTo ByteStringBuilder.Builder PrimitiveByteArray.ByteArray where
   to = to . to @ByteStringShort.ShortByteString
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo ByteStringBuilder.Builder TextArray.Array where
   to = to . to @ByteStringShort.ShortByteString
+#endif
 
 --
 
@@ -368,11 +381,14 @@
 instance IsomorphicTo PrimitiveByteArray.ByteArray ByteStringBuilder.Builder where
   to = to . to @ByteStringShort.ShortByteString
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo PrimitiveByteArray.ByteArray TextArray.Array where
   to a = PrimitiveByteArray.ByteArray (TextCompatArray.toUnliftedByteArray a)
+#endif
 
 --
 
+#if !MIN_VERSION_text(2,1,0)
 instance IsomorphicTo TextArray.Array [Word8] where
   to = to . to @ByteStringShort.ShortByteString
 
@@ -390,6 +406,7 @@
 
 instance IsomorphicTo TextArray.Array ByteStringBuilder.Builder where
   to = to . to @ByteStringShort.ShortByteString
+#endif
 
 --
 
diff --git a/library/IsomorphismClass/Prelude.hs b/library/IsomorphismClass/Prelude.hs
--- a/library/IsomorphismClass/Prelude.hs
+++ b/library/IsomorphismClass/Prelude.hs
@@ -26,7 +26,7 @@
 import Data.Fixed as Exports
 import Data.Foldable as Exports hiding (toList)
 import Data.Function as Exports hiding (id, (.))
-import Data.Functor as Exports
+import Data.Functor as Exports hiding (unzip)
 import Data.Functor.Classes as Exports
 import Data.Functor.Compose as Exports
 import Data.Functor.Contravariant as Exports