Added support for INPUT and TEXTAREA