New changes for plugin