Add support for chunking