Updates for latest engine