Support more output formats