Updated to use OID type data.