Add benchmark
General improvement