Added support for disabled input fields