Simplify init/updates for collaborators (want more tests)