Added chunk support and chunk controller