Update protocol to work with v2 throughout.