Changes for plugin