adding chunking support