Add more output and more columns