Add chunking support