Add support for underline