Customizations and fixed how the plugin is set up