Add location data in Jison format and refactor