Added OID field to some tables