diff --git a/rosmsg.cabal b/rosmsg.cabal
--- a/rosmsg.cabal
+++ b/rosmsg.cabal
@@ -1,5 +1,5 @@
 name:                rosmsg
-version:             0.5.1.0
+version:             0.5.2.0
 synopsis:            ROS message parser, render, TH
 description:         Please see README.md
 homepage:            https://github.com/RoboticsHS/rosmsg#readme
diff --git a/src/Robotics/ROS/Msg.hs b/src/Robotics/ROS/Msg.hs
--- a/src/Robotics/ROS/Msg.hs
+++ b/src/Robotics/ROS/Msg.hs
@@ -24,8 +24,9 @@
 -- for native Haskell structures creation.
 --
 module Robotics.ROS.Msg (
-  -- * ROS Message classes
-    module Robotics.ROS.Msg.Class
+  -- * ROS message classes
+    Message(..)
+  , Stamped(..)
   -- * Common used types
   -- ** Array-like
   , ROSFixedArray(..)
diff --git a/src/Robotics/ROS/Msg/TH.hs b/src/Robotics/ROS/Msg/TH.hs
--- a/src/Robotics/ROS/Msg/TH.hs
+++ b/src/Robotics/ROS/Msg/TH.hs
@@ -204,10 +204,10 @@
 -- | Simple data type declaration with one constructor
 dataD' :: Name -> ConQ -> [Name] -> DecQ
 dataD' name rec derive =
-#if __GLASGOW_HASKELL__ < 800
-    dataD (cxt []) name [] [rec] derive
-#else
+#if MIN_VERSION_template_haskell(2,11,0)
     dataD (cxt []) name [] Nothing [rec] $ cxt (conT <$> derive)
+#else
+    dataD (cxt []) name [] [rec] derive
 #endif
 
 -- | Simple function declaration