Modified plugin order