Edits to the wr1 parser so it can handle the oid refactor

Change-Id: Ie1d532853e3b037fe19628d870e4d43eb038ad95