Modify parser a little bit