Rename fields to make more sense
Add benchmarking