Changes on plugin's implementation