Begin refactoring of data collection and optimization of caching and indexing of rows.