Disentangled signup and updates from couch native format.