Adding multiple engine support