Continue work on refactoring NuCollection