Added support for input and textarea fields