diff --git a/haskus-utils-data.cabal b/haskus-utils-data.cabal
--- a/haskus-utils-data.cabal
+++ b/haskus-utils-data.cabal
@@ -1,40 +1,46 @@
-cabal-version: >=1.20
-name: haskus-utils-data
-version: 1.1
-license: BSD3
-license-file: LICENSE
-copyright: Sylvain Henry 2018
-maintainer: sylvain@haskus.fr
-author: Sylvain Henry
-homepage: http://www.haskus.org
-synopsis: Haskus utility modules
+name:                haskus-utils-data
+version:             1.1.1
+synopsis:            Haskus utility modules
+license:             BSD3
+license-file:        LICENSE
+author:              Sylvain Henry
+maintainer:          sylvain@haskus.fr
+homepage:            http://www.haskus.org
+copyright:           Sylvain Henry 2018
+category:            System
+build-type:          Simple
+cabal-version:       >=1.20
+
 description:
-    Haskus data utility modules
-category: System
-build-type: Simple
+   Haskus data utility modules
 
 source-repository head
-    type: git
-    location: git://github.com/haskus/haskus-utils.git
+  type: git
+  location: git://github.com/haskus/haskus-utils.git
 
 library
-    exposed-modules:
-        Haskus.Utils.Monad
-        Haskus.Utils.HList
-        Haskus.Utils.Functor
-        Haskus.Utils.List
-        Haskus.Utils.Map
-        Haskus.Utils.Map.Strict
-        Haskus.Utils.Maybe
-        Haskus.Utils.Tuple
-    hs-source-dirs: src/lib
-    default-language: Haskell2010
-    ghc-options: -Wall
-    build-depends:
-        base >=4.9 && <4.12,
-        haskus-utils-types ==1.1.*,
-        extra >=1.4 && <1.7,
-        recursion-schemes ==5.0.*,
-        containers ==0.5.*,
-        mtl ==2.2.*,
-        transformers >=0.4 && <0.6
+  exposed-modules:
+    Haskus.Utils.Monad
+    Haskus.Utils.HList
+    Haskus.Utils.Functor
+    Haskus.Utils.List
+    Haskus.Utils.Map
+    Haskus.Utils.Map.Strict
+    Haskus.Utils.Maybe
+    Haskus.Utils.Tuple
+
+  other-modules:
+
+  build-depends:       
+      base                      >= 4.9 && < 5
+   ,  haskus-utils-types        >= 1.1
+   ,  extra                     >= 1.4
+   ,  recursion-schemes         >= 5.0
+   ,  containers                >= 0.5
+   ,  mtl                       >= 2.2
+   ,  transformers              >= 0.4
+
+  build-tools: 
+  ghc-options:          -Wall
+  default-language:     Haskell2010
+  hs-source-dirs:       src/lib
diff --git a/src/lib/Haskus/Utils/Functor.hs b/src/lib/Haskus/Utils/Functor.hs
--- a/src/lib/Haskus/Utils/Functor.hs
+++ b/src/lib/Haskus/Utils/Functor.hs
@@ -4,4 +4,4 @@
    )
 where
 
-import Data.Functor.Foldable
+import Data.Functor.Foldable hiding (ListF(..))