added support for all editText fields