diff --git a/CHANGES.md b/CHANGES.md
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+0.2.0.0
+=======
+
+-   Track starting positions in source annotations
+-   Move docs to a separate field
+
+0.1.0.1
+=======
+
+-   Allow `base` 4.9
+
 0.1.0.0
 =======
 
diff --git a/Language/Thrift/Parser.hs b/Language/Thrift/Parser.hs
--- a/Language/Thrift/Parser.hs
+++ b/Language/Thrift/Parser.hs
@@ -29,8 +29,9 @@
 import Control.Monad
 import Control.Monad.State     (StateT)
 import Data.Text               (Text)
-import Text.Trifecta
 import Text.Parser.Token.Style (emptyIdents)
+import Text.Trifecta
+import Text.Trifecta.Delta     (Delta)
 
 import qualified Control.Monad.State as State
 import qualified Data.Text           as Text
@@ -51,6 +52,7 @@
       , MonadPlus
       , Parsing
       , CharParsing
+      , DeltaParsing
       )
 
 lastDocstring :: ThriftParser T.Docstring
@@ -97,8 +99,11 @@
               , Text.pack      <$> some (noneOf "/*") >>= loop . (:chunks)
               , Text.singleton <$>        oneOf "/*"  >>= loop . (:chunks)
               ]
+            sanitizeDocstring :: Text -> Text
             sanitizeDocstring =
-              Text.unlines . map (Text.dropWhile (`elem` "* ")) . Text.lines
+                Text.unlines . map (Text.dropWhile ignore) . Text.lines
+              where
+                ignore c = c == '*' || c == ' '
 
 idStyle :: IdentifierStyle ThriftParser
 idStyle = (emptyIdents :: IdentifierStyle ThriftParser)
@@ -109,7 +114,7 @@
 reserved :: Text -> ThriftParser ()
 reserved = reserveText idStyle
 
-program :: ThriftParser (T.Program T.Docstring)
+program :: ThriftParser (T.Program Delta)
 program = whiteSpace >> T.Program <$> many header <*> many definition
 
 literal :: ThriftParser Text
@@ -133,35 +138,37 @@
   , reserved "csharp_namespace" >> T.Namespace "csharp" <$> identifier
   ]
 
-docstring :: ThriftParser (T.Docstring -> a) -> ThriftParser a
-docstring p = lastDocstring >>= \s -> p <*> pure s
+docstring :: ThriftParser (T.Docstring -> Delta -> a) -> ThriftParser a
+docstring p = lastDocstring >>= \s -> do
+    startPosition <- position
+    p <*> pure s <*> pure startPosition
 
-definition :: ThriftParser (T.Definition T.Docstring)
+definition :: ThriftParser (T.Definition Delta)
 definition = choice [constant, typeDefinition, service]
 
-typeDefinition :: ThriftParser (T.Definition T.Docstring)
+typeDefinition :: ThriftParser (T.Definition Delta)
 typeDefinition =
   T.TypeDefinition
     <$> choice [typedef, enum, senum, struct, union, exception]
     <*> typeAnnotations
 
-typedef :: ThriftParser (T.Type T.Docstring)
+typedef :: ThriftParser (T.Type Delta)
 typedef = reserved "typedef" >>
     docstring (T.Typedef <$> fieldType <*> identifier)
 
-enum :: ThriftParser (T.Type T.Docstring)
+enum :: ThriftParser (T.Type Delta)
 enum = reserved "enum" >>
     docstring (T.Enum <$> identifier <*> braces (many enumDef))
 
-struct :: ThriftParser (T.Type T.Docstring)
+struct :: ThriftParser (T.Type Delta)
 struct = reserved "struct" >>
     docstring (T.Struct <$> identifier <*> braces (many field))
 
-union :: ThriftParser (T.Type T.Docstring)
+union :: ThriftParser (T.Type Delta)
 union = reserved "union" >>
     docstring (T.Union <$> identifier <*> braces (many field))
 
-exception :: ThriftParser (T.Type T.Docstring)
+exception :: ThriftParser (T.Type Delta)
 exception = reserved "exception" >>
      docstring (T.Exception <$> identifier <*> braces (many field))
 
@@ -171,7 +178,7 @@
   , reserved "optional" *> pure T.Optional
   ]
 
-field :: ThriftParser (T.Field T.Docstring)
+field :: ThriftParser (T.Field Delta)
 field = docstring $
   T.Field
     <$> optional (integer <* symbolic ':')
@@ -185,7 +192,7 @@
 equals :: ThriftParser ()
 equals = void $ symbolic '='
 
-enumDef :: ThriftParser (T.EnumDef T.Docstring)
+enumDef :: ThriftParser (T.EnumDef Delta)
 enumDef = docstring $
   T.EnumDef
     <$> identifier
@@ -193,11 +200,11 @@
     <*> typeAnnotations
     <*  optionalSep
 
-senum :: ThriftParser (T.Type T.Docstring)
+senum :: ThriftParser (T.Type Delta)
 senum = reserved "senum" >> docstring
     (T.Senum <$> identifier <*> braces (many (literal <* optionalSep)))
 
-constant :: ThriftParser (T.Definition T.Docstring)
+constant :: ThriftParser (T.Definition Delta)
 constant = do
   reserved "const"
   docstring $
@@ -259,7 +266,7 @@
     setType = reserved "set" >> angles (T.SetType <$> fieldType)
     listType = reserved "list" >> angles (T.ListType <$> fieldType)
 
-service :: ThriftParser (T.Definition T.Docstring)
+service :: ThriftParser (T.Definition Delta)
 service = do
   reserved "service"
   docstring $
@@ -269,7 +276,7 @@
         <*> braces (many function)
         <*> typeAnnotations
 
-function :: ThriftParser (T.Function T.Docstring)
+function :: ThriftParser (T.Function Delta)
 function = docstring $
     T.Function
         <$> ((reserved "oneway" *> pure True) <|> pure False)
diff --git a/Language/Thrift/Types.hs b/Language/Thrift/Types.hs
--- a/Language/Thrift/Types.hs
+++ b/Language/Thrift/Types.hs
@@ -32,10 +32,11 @@
 
 data Definition srcAnnot
     = ConstDefinition
-        { constType     :: FieldType
-        , constName     :: Text
-        , constValue    :: ConstValue
-        , constSrcAnnot :: srcAnnot
+        { constType      :: FieldType
+        , constName      :: Text
+        , constValue     :: ConstValue
+        , constDocstring :: Docstring
+        , constSrcAnnot  :: srcAnnot
         }
     | TypeDefinition
         { typeDefinition  :: Type srcAnnot
@@ -46,40 +47,47 @@
         , serviceExtends     :: Maybe Text
         , serviceFunctions   :: [Function srcAnnot]
         , serviceAnnotations :: [TypeAnnotation]
+        , serviceDocstring   :: Docstring
         , serviceSrcAnnot    :: srcAnnot
         }
   deriving (Show, Ord, Eq, Data, Typeable, Generic)
 
 data Type srcAnnot
     = Typedef
-        { typedefType     :: FieldType
-        , typedefName     :: Text
-        , typedefSrcAnnot :: srcAnnot
+        { typedefType      :: FieldType
+        , typedefName      :: Text
+        , typedefDocstring :: Docstring
+        , typedefSrcAnnot  :: srcAnnot
         }
     | Enum
-        { enumName     :: Text
-        , enumValues   :: [EnumDef srcAnnot]
-        , enumSrcAnnot :: srcAnnot
+        { enumName      :: Text
+        , enumValues    :: [EnumDef srcAnnot]
+        , enumDocstring :: Docstring
+        , enumSrcAnnot  :: srcAnnot
         }
     | Struct
-        { structName     :: Text
-        , structFields   :: [Field srcAnnot]
-        , structSrcAnnot :: srcAnnot
+        { structName      :: Text
+        , structFields    :: [Field srcAnnot]
+        , structDocstring :: Docstring
+        , structSrcAnnot  :: srcAnnot
         }
     | Union
-        { unionName     :: Text
-        , unionFields   :: [Field srcAnnot]
-        , unionSrcAnnot :: srcAnnot
+        { unionName      :: Text
+        , unionFields    :: [Field srcAnnot]
+        , unionDocstring :: Docstring
+        , unionSrcAnnot  :: srcAnnot
         }
     | Exception
-        { exceptionName     :: Text
-        , exceptionFields   :: [Field srcAnnot]
-        , exceptionSrcAnnot :: srcAnnot
+        { exceptionName      :: Text
+        , exceptionFields    :: [Field srcAnnot]
+        , exceptionDocstring :: Docstring
+        , exceptionSrcAnnot  :: srcAnnot
         }
     | Senum
-        { senumName     :: Text
-        , senumValues   :: [Text]
-        , senumSrcAnnot :: srcAnnot
+        { senumName      :: Text
+        , senumValues    :: [Text]
+        , senumDocstring :: Docstring
+        , senumSrcAnnot  :: srcAnnot
         }
   deriving (Show, Ord, Eq, Data, Typeable, Generic)
 
@@ -93,6 +101,7 @@
     , fieldName         :: Text
     , fieldDefault      :: Maybe ConstValue
     , fieldAnnotations  :: [TypeAnnotation]
+    , fieldDocstring    :: Docstring
     , fieldSrcAnnot     :: srcAnnot
     }
   deriving (Show, Ord, Eq, Data, Typeable, Generic)
@@ -101,6 +110,7 @@
     { enumDefName        :: Text
     , enumDefValue       :: Maybe Integer
     , enumDefAnnotations :: [TypeAnnotation]
+    , enumDefDocstring   :: Docstring
     , enumDefSrcAnnot    :: srcAnnot
     }
   deriving (Show, Ord, Eq, Data, Typeable, Generic)
@@ -141,6 +151,7 @@
     , functionParameters  :: [Field srcAnnot]
     , functionExceptions  :: Maybe [Field srcAnnot]
     , functionAnnotations :: [TypeAnnotation]
+    , functionDocstring   :: Docstring
     , functionSrcAnnot    :: srcAnnot
     }
   deriving (Show, Ord, Eq, Data, Typeable, Generic)
diff --git a/language-thrift.cabal b/language-thrift.cabal
--- a/language-thrift.cabal
+++ b/language-thrift.cabal
@@ -1,5 +1,5 @@
 name          : language-thrift
-version       : 0.1.0.1
+version       : 0.2.0.0
 synopsis      : Parser for the Thrift IDL format.
 homepage      : https://github.com/abhinav/language-thrift
 license       : BSD3