Add printing of extras to the formatter
Merge branch 'add-extra-to-formatter'