Feature/perf automation2