Update for engine improvements