Add helpers and benchmarks