Further work on chunk system