Move conversion options to new enum