[WFLY-490] Revisit output format