Changed properties to be able to run benchmarks