Updates to account for v3 of the protocol