Add support for password field