Adapt to engine changes