Moderate performance improvements (without using chunk mapping)