Changed parser impl