New Changes to plugin