Update - split entites and chunks into separate layers, allow each to be more configured