Added options to specify format to generate