Move helper functions into perf
Build issue