Remodeling the plugin