Add. Reimplemented perf tests