Fix parameter passing issue to our plugin
Optimize
Format