Added support for text boxes
Updated to do