Refactored to use the ChunkTypes class