diff --git a/plyproto/model.py b/plyproto/model.py
index e471126..f3b33d6 100644
--- a/plyproto/model.py
+++ b/plyproto/model.py
@@ -10,8 +10,7 @@
 
     def __getattr__(self, name):
         if not name.startswith('visit_'):
-            raise AttributeError('name must start with visit_ but was {}'
-                                 .format(name))
+            raise AttributeError('name must start with visit_ but was {}'.format(name))
 
         def f(element):
             if self.verbose:
@@ -35,6 +34,7 @@
     # visitor.visit_ExtensionsDirective(self)
     # visitor.visit_Literal(self)
     # visitor.visit_Name(self)
+    # visitor.visit_Proto(self)
 
 # Base node
 class SourceElement(object):
@@ -42,9 +42,12 @@
     A SourceElement is the base class for all elements that occur in a Protocol Buffers
     file parsed by plyproto.
     '''
-    def __init__(self):
+    def __init__(self, linespan=[], lexspan=[], p=None):
         super(SourceElement, self).__init__()
-        self._fields = []
+        self._fields = [] # ['linespan', 'lexspan']
+        self.linespan = linespan
+        self.lexspan = lexspan
+        self.p = p
 
     def __repr__(self):
         equals = ("{0}={1!r}".format(k, getattr(self, k))
@@ -61,31 +64,38 @@
     def __ne__(self, other):
         return not self == other
 
+    def setLexData(self, linespan, lexspan):
+        self.linespan = linespan
+        self.lexspan = lexspan
+
+    def setLexObj(self, p):
+        self.p = p
+
     def accept(self, visitor):
         pass
 
 class PackageStatement(SourceElement):
-    def __init__(self, name):
-        super(PackageStatement, self).__init__()
-        self._fields = ['name']
+    def __init__(self, name, linespan=None, lexspan=None, p=None):
+        super(PackageStatement, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name']
         self.name = name
 
     def accept(self, visitor):
         visitor.visit_PackageStatement(self)
 
 class ImportStatement(SourceElement):
-    def __init__(self, name):
-        super(ImportStatement, self).__init__()
-        self._fields = ['name']
+    def __init__(self, name, linespan=None, lexspan=None, p=None):
+        super(ImportStatement, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name']
         self.name = name
 
     def accept(self, visitor):
         visitor.visit_ImportStatement(self)
 
 class OptionStatement(SourceElement):
-    def __init__(self, name, value):
-        super(OptionStatement, self).__init__()
-        self._fields = ['name', 'value']
+    def __init__(self, name, value, linespan=None, lexspan=None, p=None):
+        super(OptionStatement, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'value']
         self.name = name
         self.value = value
 
@@ -93,9 +103,9 @@
         visitor.visit_OptionStatement(self)
 
 class FieldDirective(SourceElement):
-    def __init__(self, name, value):
-        super(FieldDirective, self).__init__()
-        self._fields = ['name', 'value']
+    def __init__(self, name, value, linespan=None, lexspan=None, p=None):
+        super(FieldDirective, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'value']
         self.name = name
         self.value = value
 
@@ -103,18 +113,18 @@
         visitor.visit_FieldDirective(self)
 
 class FieldType(SourceElement):
-    def __init__(self, name):
-        super(FieldType, self).__init__()
-        self._fields = ['name']
+    def __init__(self, name, linespan=None, lexspan=None, p=None):
+        super(FieldType, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name']
         self.name = name
 
     def accept(self, visitor):
         visitor.visit_FieldType(self)
 
 class FieldDefinition(SourceElement):
-    def __init__(self, field_modifier, ftype, name, fieldId, fieldDirective):
-        super(FieldDefinition, self).__init__()
-        self._fields = ['field_modifier', 'ftype', 'name', 'fieldId', 'fieldDirective']
+    def __init__(self, field_modifier, ftype, name, fieldId, fieldDirective, linespan=None, lexspan=None, p=None):
+        super(FieldDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['field_modifier', 'ftype', 'name', 'fieldId', 'fieldDirective']
         self.name = name
         self.field_modifier = field_modifier
         self.ftype = ftype
@@ -125,9 +135,9 @@
         visitor.visit_FieldDefinition(self)
 
 class EnumFieldDefinition(SourceElement):
-    def __init__(self, name, fieldId):
-        super(EnumFieldDefinition, self).__init__()
-        self._fields = ['name', 'fieldId']
+    def __init__(self, name, fieldId, linespan=None, lexspan=None, p=None):
+        super(EnumFieldDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'fieldId']
         self.name = name
         self.fieldId = fieldId
 
@@ -135,9 +145,9 @@
         visitor.visit_EnumFieldDefinition(self)
 
 class EnumDefinition(SourceElement):
-    def __init__(self, name, body):
-        super(EnumDefinition, self).__init__()
-        self._fields = ['name', 'body']
+    def __init__(self, name, body, linespan=None, lexspan=None, p=None):
+        super(EnumDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'body']
         self.name = name
         self.body = body
 
@@ -147,9 +157,9 @@
                 s.accept(visitor)
 
 class MessageDefinition(SourceElement):
-    def __init__(self, name, body):
-        super(MessageDefinition, self).__init__()
-        self._fields = ['name', 'body']
+    def __init__(self, name, body, linespan=None, lexspan=None, p=None):
+        super(MessageDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'body']
         self.name = name
         self.body = body
 
@@ -159,9 +169,9 @@
                 s.accept(visitor)
 
 class MessageExtension(SourceElement):
-    def __init__(self, name, body):
-        super(MessageExtension, self).__init__()
-        self._fields = ['name', 'body']
+    def __init__(self, name, body, linespan=None, lexspan=None, p=None):
+        super(MessageExtension, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'body']
         self.name = name
         self.body = body
 
@@ -171,9 +181,9 @@
                 s.accept(visitor)
 
 class MethodDefinition(SourceElement):
-    def __init__(self, name, name2, name3):
-        super(MethodDefinition, self).__init__()
-        self._fields = ['name', 'name2', 'name3']
+    def __init__(self, name, name2, name3, linespan=None, lexspan=None, p=None):
+        super(MethodDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'name2', 'name3']
         self.name = name
         self.name2 = name2
         self.name3 = name3
@@ -182,9 +192,9 @@
         visitor.visit_MethodDefinition(self)
 
 class ServiceDefinition(SourceElement):
-    def __init__(self, name, body):
-        super(ServiceDefinition, self).__init__()
-        self._fields = ['name', 'body']
+    def __init__(self, name, body, linespan=None, lexspan=None, p=None):
+        super(ServiceDefinition, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['name', 'body']
         self.name = name
         self.body = body
 
@@ -197,9 +207,9 @@
     pass
 
 class ExtensionsDirective(SourceElement):
-    def __init__(self, fromVal, toVal):
-        super(ExtensionsDirective, self).__init__()
-        self._fields = ['fromVal', 'toVal']
+    def __init__(self, fromVal, toVal, linespan=None, lexspan=None, p=None):
+        super(ExtensionsDirective, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['fromVal', 'toVal']
         self.fromVal = fromVal
         self.toVal = toVal
 
@@ -208,9 +218,9 @@
 
 class Literal(SourceElement):
 
-    def __init__(self, value):
-        super(Literal, self).__init__()
-        self._fields = ['value']
+    def __init__(self, value, linespan=None, lexspan=None, p=None):
+        super(Literal, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['value']
         self.value = value
 
     def accept(self, visitor):
@@ -218,9 +228,9 @@
 
 class Name(SourceElement):
 
-    def __init__(self, value):
-        super(Name, self).__init__()
-        self._fields = ['value']
+    def __init__(self, value, linespan=None, lexspan=None, p=None):
+        super(Name, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['value']
         self.value = value
 
     def append_name(self, name):
@@ -232,4 +242,15 @@
     def accept(self, visitor):
         visitor.visit_Name(self)
 
+class ProtoFile(SourceElement):
 
+    def __init__(self, pkg, body, linespan=None, lexspan=None, p=None):
+        super(ProtoFile, self).__init__(linespan=linespan, lexspan=lexspan, p=p)
+        self._fields += ['pkg', 'body']
+        self.pkg = pkg
+        self.body = body
+
+    def accept(self, visitor):
+        if visitor.visit_Proto(self):
+            for s in self.body:
+                s.accept(visitor)
diff --git a/plyproto/parser.py b/plyproto/parser.py
index 7c1df07..275a2ca 100755
--- a/plyproto/parser.py
+++ b/plyproto/parser.py
@@ -20,7 +20,8 @@
         'LINE_COMMENT', 'BLOCK_COMMENT',
 
         'LBRACE', 'RBRACE', 'LBRACK', 'RBRACK',
-        'LPAR', 'RPAR', 'EQ', 'SEMI', 'DOT'
+        'LPAR', 'RPAR', 'EQ', 'SEMI', 'DOT',
+        'PLUSPLUSPLUS'
 
     ] + [k.upper() for k in keywords]
     literals = '()+-*/=?:,.^|&~!=[]{};<>@%'
@@ -43,6 +44,7 @@
     t_SEMI = ';'
     t_DOT = '\\.'
     t_ignore = ' \t\f'
+    t_PLUSPLUSPLUS = '\\+\\+\\+'
 
     def t_NAME(self, t):
         '[A-Za-z_$][A-Za-z0-9_$]*'
@@ -63,6 +65,32 @@
         print("Illegal character '{}' ({}) in line {}".format(t.value[0], hex(ord(t.value[0])), t.lexer.lineno))
         t.lexer.skip(1)
 
+class LexHelper:
+    @staticmethod
+    def get_max_linespan(p):
+        mSpan=[1e60, -1]
+        for sp in range(0, len(p)):
+            csp = p.linespan(sp)
+            if csp[0]==0 and csp[1]==0: continue
+            if csp[0] < mSpan[0]: mSpan[0] = csp[0]
+            if csp[1] > mSpan[1]: mSpan[1] = csp[1]
+        return tuple(mSpan)
+
+    @staticmethod
+    def get_max_lexspan(p):
+        mSpan=[1e60, -1]
+        for sp in range(0, len(p)):
+            csp = p.lexspan(sp)
+            if csp[0]==0 and csp[1]==0: continue
+            if csp[0] < mSpan[0]: mSpan[0] = csp[0]
+            if csp[1] > mSpan[1]: mSpan[1] = csp[1]
+        return tuple(mSpan)
+
+    @staticmethod
+    def set_parse_object(dst, p):
+        dst.setLexData(linespan=LexHelper.get_max_linespan(p), lexspan=LexHelper.get_max_lexspan(p))
+        dst.setLexObj(p)
+
 class ProtobufParser(object):
     tokens = ProtobufLexer.tokens
 
@@ -111,6 +139,7 @@
     def p_field_directive(self, p):
         '''field_directive : LBRACK NAME EQ rvalue RBRACK'''
         p[0] = FieldDirective(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     def p_field_directive_times(self, p):
         '''field_directive_times : field_directive_plus'''
@@ -143,20 +172,24 @@
     def p_field_type(self, p):
         '''field_type : primitive_type'''
         p[0] = FieldType(p[1])
+        LexHelper.set_parse_object(p[0], p)
 
     def p_field_type2(self, p):
         '''field_type : dotname'''
         p[0] = Name(p[1])
+        LexHelper.set_parse_object(p[0], p)
 
     # Root of the field declaration.
     def p_field_definition(self, p):
         '''field_definition : field_modifier field_type field_name EQ field_id field_directive_times SEMI'''
         p[0] = FieldDefinition(p[1], p[2], Name(p[3]), p[5], p[6])
+        LexHelper.set_parse_object(p[0], p)
 
     # Root of the enum field declaration.
     def p_enum_field(self, p):
         '''enum_field : field_name EQ NUM SEMI'''
         p[0] = EnumFieldDefinition(Name(p[1]), p[3])
+        LexHelper.set_parse_object(p[0], p)
 
     def p_enum_body_part(self, p):
         '''enum_body_part : enum_field
@@ -184,6 +217,7 @@
     def p_enum_definition(self, p):
         '''enum_definition : ENUM NAME LBRACE enum_body_opt RBRACE'''
         p[0] = EnumDefinition(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     def p_extensions_to(self, p):
         '''extensions_to : MAX'''
@@ -197,11 +231,13 @@
     def p_extensions_definition(self, p):
         '''extensions_definition : EXTENSIONS NUM TO extensions_to SEMI'''
         p[0] = ExtensionsDirective(p[2], p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     # message_extension ::= 'extend' ident '{' message_body '}'
     def p_message_extension(self, p):
         '''message_extension : EXTEND NAME LBRACE message_body RBRACE'''
         p[0] = MessageExtension(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     def p_message_body_part(self, p):
         '''message_body_part : field_definition
@@ -230,11 +266,13 @@
     def p_message_definition(self, p):
         '''message_definition : MESSAGE NAME LBRACE message_body RBRACE'''
         p[0] = MessageDefinition(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     # method_definition ::= 'rpc' ident '(' [ ident ] ')' 'returns' '(' [ ident ] ')' ';'
     def p_method_definition(self, p):
         '''method_definition : RPC NAME LPAR NAME RPAR RETURNS LPAR NAME RPAR'''
         p[0] = MethodDefinition(Name(p[2]), Name(p[4]), Name(p[8]))
+        LexHelper.set_parse_object(p[0], p)
 
     def p_method_definition_opt(self, p):
         '''method_definition_opt : empty'''
@@ -253,16 +291,19 @@
     def p_service_definition(self, p):
         '''service_definition : SERVICE NAME LBRACE method_definition_opt RBRACE'''
         p[0] = ServiceDefinition(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     # package_directive ::= 'package' ident [ '.' ident]* ';'
     def p_package_directive(self,p):
         '''package_directive : PACKAGE dotname SEMI'''
         p[0] = PackageStatement(Name(p[2]))
+        LexHelper.set_parse_object(p[0], p)
 
     # import_directive = IMPORT_ - quotedString("importFileSpec") + SEMI
     def p_import_directive(self, p):
         '''import_directive : IMPORT STRING_LITERAL SEMI'''
         p[0] = ImportStatement(Literal(p[2]))
+        LexHelper.set_parse_object(p[0], p)
 
     def p_option_rvalue(self, p):
         '''option_rvalue : NUM
@@ -278,6 +319,7 @@
     def p_option_directive(self, p):
         '''option_directive : OPTION NAME EQ option_rvalue SEMI'''
         p[0] = OptionStatement(Name(p[2]), p[4])
+        LexHelper.set_parse_object(p[0], p)
 
     # topLevelStatement = Group(message_definition | message_extension | enum_definition | service_definition | import_directive | option_directive)
     def p_topLevel(self,p):
@@ -310,9 +352,15 @@
         p[0] = []
 
     # parser = Optional(package_directive) + ZeroOrMore(topLevelStatement)
-    def p_goal2(self, p):
-        '''goal : package_definition statements'''
-        p[0] = [p[1], p[2]]
+    def p_protofile(self, p):
+        '''protofile : package_definition statements'''
+        p[0] = ProtoFile(p[1], p[2])
+        LexHelper.set_parse_object(p[0], p)
+
+    # Parsing starting point
+    def p_goal(self, p):
+        '''goal : PLUSPLUSPLUS protofile'''
+        p[0] = p[2]
 
     def p_error(self, p):
         print('error: {}'.format(p))
@@ -336,7 +384,7 @@
             content += line
         return self.tokenize_string(content)
 
-    def parse_string(self, code, debug=0, lineno=1, prefix=''):
+    def parse_string(self, code, debug=0, lineno=1, prefix='+++'):
         self.lexer.lineno = lineno
         return self.parser.parse(prefix + code, lexer=self.lexer, debug=debug)