Feature/reporter shim