This looks great ! Will try it out and document the perf improvements.