Update for new engine API