Refactor ConversionOptions framework