Update Parser and LocationInterface