[TASK] EXT:reports Improve xclass reporting