Changes on plugin