- Performance improvements
