add key-aware chunking