Added new options for formatting output