Performance improvements#