diff --git a/invertible-grammar.cabal b/invertible-grammar.cabal
--- a/invertible-grammar.cabal
+++ b/invertible-grammar.cabal
@@ -1,9 +1,9 @@
 name:                invertible-grammar
-version:             0.1.2
+version:             0.1.3
 license:             BSD3
 license-file:        LICENSE
-author:              Eugene Smolanka, Sergey Vinokurov
-maintainer:          Eugene Smolanka <esmolanka@gmail.com>
+author:              Yevhen Smolanka, Sergey Vinokurov
+maintainer:          Yevhen Smolanka <ys@polymorphic.me>, Sergey Vinokurov <serg.foo@gmail.com>
 homepage:            https://github.com/esmolanka/invertible-grammar
 category:            Language
 build-type:          Simple
@@ -14,11 +14,11 @@
 description:
   Grammar combinator framework to build invertible parsing libraries
   for concrete syntax.
-tested-with:   GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3
+tested-with:   GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.5
 
 source-repository head
   type: git
-  location: https://github.com/esmolanka/invertible-grammar
+  location: https://github.com/esmolanka/sexp-grammar
 
 library
   hs-source-dirs:      src
@@ -36,14 +36,14 @@
     Data.InvertibleGrammar.Monad
 
   build-depends:
-      base              >=4.7   && <5.0
+      base              >=4.8   && <5.0
     , bifunctors        >=4.2   && <5.6
     , containers        >=0.5.5 && <0.7
     , mtl               >=2.1   && <2.3
-    , prettyprinter     >=1     && <1.3
-    , profunctors       >=4.4   && <5.4
-    , semigroups        >=0.16  && <0.19
+    , prettyprinter     >=1     && <1.8
+    , profunctors       >=4.4   && <5.6
+    , semigroups        >=0.16  && <0.20
     , tagged            >=0.7   && <0.9
-    , template-haskell  >=2.9   && <2.15
+    , template-haskell  >=2.9   && <2.17
     , transformers      >=0.3   && <0.6
     , text              >=1.2   && <1.3
diff --git a/src/Control/Monad/ContextError.hs b/src/Control/Monad/ContextError.hs
--- a/src/Control/Monad/ContextError.hs
+++ b/src/Control/Monad/ContextError.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE RankNTypes             #-}
+{-# LANGUAGE Safe                   #-}
 {-# LANGUAGE UndecidableInstances   #-}
 
 module Control.Monad.ContextError
diff --git a/src/Data/InvertibleGrammar.hs b/src/Data/InvertibleGrammar.hs
--- a/src/Data/InvertibleGrammar.hs
+++ b/src/Data/InvertibleGrammar.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE Safe #-}
+
 module Data.InvertibleGrammar
   ( -- * Base
     Grammar, (:-), forward, backward
diff --git a/src/Data/InvertibleGrammar/Base.hs b/src/Data/InvertibleGrammar/Base.hs
--- a/src/Data/InvertibleGrammar/Base.hs
+++ b/src/Data/InvertibleGrammar/Base.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE DeriveFunctor         #-}
 {-# LANGUAGE DeriveTraversable     #-}
 {-# LANGUAGE GADTs                 #-}
+{-# LANGUAGE Trustworthy           #-}
 {-# LANGUAGE TypeOperators         #-}
 
 module Data.InvertibleGrammar.Base
diff --git a/src/Data/InvertibleGrammar/Combinators.hs b/src/Data/InvertibleGrammar/Combinators.hs
--- a/src/Data/InvertibleGrammar/Combinators.hs
+++ b/src/Data/InvertibleGrammar/Combinators.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE CPP                 #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE Trustworthy         #-}
 {-# LANGUAGE TypeOperators       #-}
 
 module Data.InvertibleGrammar.Combinators
diff --git a/src/Data/InvertibleGrammar/Generic.hs b/src/Data/InvertibleGrammar/Generic.hs
--- a/src/Data/InvertibleGrammar/Generic.hs
+++ b/src/Data/InvertibleGrammar/Generic.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE OverloadedStrings      #-}
 {-# LANGUAGE PolyKinds              #-}
 {-# LANGUAGE RankNTypes             #-}
+{-# LANGUAGE Safe                   #-}
 {-# LANGUAGE ScopedTypeVariables    #-}
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE TypeOperators          #-}
diff --git a/src/Data/InvertibleGrammar/Monad.hs b/src/Data/InvertibleGrammar/Monad.hs
--- a/src/Data/InvertibleGrammar/Monad.hs
+++ b/src/Data/InvertibleGrammar/Monad.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE Safe              #-}
 {-# LANGUAGE ViewPatterns      #-}
 
 module Data.InvertibleGrammar.Monad