Work on txt field support