Update for new engine index function