GenericBenchmarkRecord refactor....