Added options to convert