Changed raw parser to be more extendable