Added more format options