New Version Without Hardcoded OIDs