Add support for per option set reports