Modified plugin support