Refactor list and add all, more canonical calling of persist.