Expand perf optimization TODO