Add more detailed and useful listing of output