Changes to List Parser to make current location volatile