Code changes for tabular output