More performance improvements.
Store full results as well as partial results.