Before change architecture for plugin