Eliminated need for the old parser.py module