[Incomplete] Collection persistence improvements