Refactoring so chunks are also created by the factory