Added password in more attribute type handlers