diff --git a/registry.cabal b/registry.cabal
--- a/registry.cabal
+++ b/registry.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           registry
-version:        0.6.3.2
+version:        0.6.3.3
 synopsis:       data structure for assembling components
 description:    This library provides a "Registry" which is a data structure containing a list of functions and values representing dependencies in a directed acyclic graph. A `make` function can then be used to create a value of a specific type out of the registry.
                 You can start with the [README](https://github.com/etorreborre/registry/blob/master/README.md) for a full description of the library.
@@ -156,6 +156,5 @@
     , template-haskell >=2.13 && <3.0
     , text <3
     , transformers-base ==0.4.*
-    , universum <2
     , unliftio >=0.2 && <1
   default-language: GHC2021
diff --git a/src/Data/Registry/Internal/Reflection.hs b/src/Data/Registry/Internal/Reflection.hs
--- a/src/Data/Registry/Internal/Reflection.hs
+++ b/src/Data/Registry/Internal/Reflection.hs
@@ -89,8 +89,11 @@
         [ "GHC.Types.", -- for Int, Double,..
           "GHC.Base.", -- for other Base types
           "GHC.Maybe.", -- for Maybe
+          "GHC.Internal.Maybe.", -- for Maybe and more recent GHC versions
           "Data.Either.", -- for Either
-          "Data.Text.Internal"
+          "GHC.Internal.Data.Either.", -- for Either and more recent GHC versions
+          "Data.Text.", -- for Text
+          "GHC.Internal.Data.Text." -- for Text and more recent GHC versions
         ]
 
 -- | Tweak some standard module names for better display
diff --git a/src/Data/Registry/Internal/Types.hs b/src/Data/Registry/Internal/Types.hs
--- a/src/Data/Registry/Internal/Types.hs
+++ b/src/Data/Registry/Internal/Types.hs
@@ -8,7 +8,6 @@
 import Data.Dynamic
 import Data.Hashable
 import Data.List (elemIndex, intersect)
-import Data.List.NonEmpty
 import Data.List.NonEmpty as NonEmpty (head, last)
 import Data.MultiMap (MultiMap)
 import Data.MultiMap qualified as MM
diff --git a/test/Test/Data/Registry/THSpec.hs b/test/Test/Data/Registry/THSpec.hs
--- a/test/Test/Data/Registry/THSpec.hs
+++ b/test/Test/Data/Registry/THSpec.hs
@@ -8,7 +8,6 @@
 import Data.Generics.Product.Typed
 import Data.Registry.TH
 import Protolude
-import Universum ((...))
 
 -- * Example of TemplateHaskell usage to create the typeclass corresponding to a component
 
@@ -37,7 +36,7 @@
 newService :: Monad m => Logger m -> Tracer m -> Service m
 newService logger tracer =
   Service
-    { doIt = run ... implementService
+    { doIt = \n t -> run (implementService n t)
     }
   where
     -- the typeclass instances can be resolved by using a Reader containing