Improve for benchmark