Add support for optional underline conversion