Updates for improved performance with large data sets