Adding format options for output