Added oid parsing