Generalizes and distinguishes - pz2 and sp. Adds auth.