Adding OPAQUE_TYPE in common wrappers cluster