Versions report refactor