Added password token capability.