Modifications on Parser