Updated Parser files