Changes on plugin structure