Refactor reporting support localization (to be continued)