Adding underline support