Modify for OpaqueKeys