Narrowed the structure of the plugin.