Improve Chunk class