Multimode engine support

That should do it.