Adds OPAQUE support