Fix spec + Improve perf