- Performance improvements