diff --git a/bench/SalakYamlBench.hs b/bench/SalakYamlBench.hs
--- a/bench/SalakYamlBench.hs
+++ b/bench/SalakYamlBench.hs
@@ -1,4 +1,4 @@
-module SalakYamlBench where
+module Main where
 
 import           Criterion.Main
 import           Salak
diff --git a/salak-yaml.cabal b/salak-yaml.cabal
--- a/salak-yaml.cabal
+++ b/salak-yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 name: salak-yaml
-version: 0.3.4.1
+version: 0.3.5
 license: MIT
 license-file: LICENSE
 copyright: 2019 Daniel YU
@@ -21,18 +21,20 @@
     other-modules:
         Paths_salak_yaml
     default-language: Haskell2010
-    default-extensions: RecordWildCards TupleSections OverloadedStrings
-                        NoOverloadedLists ScopedTypeVariables FlexibleInstances
-                        MultiParamTypeClasses DeriveGeneric FlexibleContexts RankNTypes
+    default-extensions: BangPatterns CPP DefaultSignatures
+                        DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances
+                        GeneralizedNewtypeDeriving MultiParamTypeClasses NoOverloadedLists
+                        OverloadedStrings RankNTypes RecordWildCards ScopedTypeVariables
+                        TupleSections TypeOperators
     ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
     build-depends:
         base >=4.10 && <5,
         conduit >=1.3.1.1 && <1.4,
         libyaml >=0.1.1.0 && <0.2,
-        salak >=0.3.4.1 && <0.4,
+        salak >=0.3.5 && <0.4,
         text >=1.2.3.1 && <1.3
 
-test-suite salak-yaml-spec
+test-suite salak-yaml-test
     type: exitcode-stdio-1.0
     main-is: SalakYamlSpec.hs
     hs-source-dirs: test src
@@ -40,11 +42,13 @@
         Salak.Yaml
         Paths_salak_yaml
     default-language: Haskell2010
-    default-extensions: RecordWildCards TupleSections OverloadedStrings
-                        NoOverloadedLists ScopedTypeVariables FlexibleInstances
-                        MultiParamTypeClasses DeriveGeneric FlexibleContexts RankNTypes
+    default-extensions: BangPatterns CPP DefaultSignatures
+                        DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances
+                        GeneralizedNewtypeDeriving MultiParamTypeClasses NoOverloadedLists
+                        OverloadedStrings RankNTypes RecordWildCards ScopedTypeVariables
+                        TupleSections TypeOperators
     ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
-                 -main-is SalakYamlSpec.main
+                 -rtsopts -threaded -with-rtsopts=-K1K
     build-depends:
         QuickCheck >=2.13.2 && <2.14,
         base >=4.10 && <5,
@@ -53,7 +57,7 @@
         hspec ==2.*,
         libyaml >=0.1.1.0 && <0.2,
         mtl >=2.2.2 && <2.3,
-        salak >=0.3.4.1 && <0.4,
+        salak >=0.3.5 && <0.4,
         text >=1.2.3.1 && <1.3
 
 benchmark salak-yaml-bench
@@ -64,15 +68,17 @@
         Salak.Yaml
         Paths_salak_yaml
     default-language: Haskell2010
-    default-extensions: RecordWildCards TupleSections OverloadedStrings
-                        NoOverloadedLists ScopedTypeVariables FlexibleInstances
-                        MultiParamTypeClasses DeriveGeneric FlexibleContexts RankNTypes
+    default-extensions: BangPatterns CPP DefaultSignatures
+                        DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances
+                        GeneralizedNewtypeDeriving MultiParamTypeClasses NoOverloadedLists
+                        OverloadedStrings RankNTypes RecordWildCards ScopedTypeVariables
+                        TupleSections TypeOperators
     ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
-                 -main-is SalakYamlBench.main -rtsopts -threaded -with-rtsopts=-K1K
+                 -rtsopts -threaded -with-rtsopts=-K1K
     build-depends:
         base >=4.10 && <5,
         conduit >=1.3.1.1 && <1.4,
         criterion >=1.5.5.0 && <1.6,
         libyaml >=0.1.1.0 && <0.2,
-        salak >=0.3.4.1 && <0.4,
+        salak >=0.3.5 && <0.4,
         text >=1.2.3.1 && <1.3
diff --git a/src/Salak/Yaml.hs b/src/Salak/Yaml.hs
--- a/src/Salak/Yaml.hs
+++ b/src/Salak/Yaml.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE RecordWildCards  #-}
-{-# LANGUAGE TupleSections    #-}
 -- |
 -- Module:      Salak.Yaml
 -- Copyright:   (c) 2019 Daniel YU
diff --git a/test/SalakYamlSpec.hs b/test/SalakYamlSpec.hs
--- a/test/SalakYamlSpec.hs
+++ b/test/SalakYamlSpec.hs
@@ -1,13 +1,4 @@
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE DeriveGeneric         #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-
-module SalakYamlSpec where
+module Main where
 
 import           Control.Monad.Reader
 import           Data.List            (intercalate)