Updated Parser file