Adding support for Opaque values.