Many reporting related changes