Use better OID utilities. Simplify