Removed oid parsing