change parser structure