Improved doc + perf