Updating general structure of plugin