More support for storing collections