added multiple password types