Added text underscore support