Switch to chunk factory