A bit of refactoring in collection/persistence