adds support for richer output format