Benchmarks and optimization added