Performance improvements for large systems