Update for latest engine