More refactoring to the plugin, removing the model, use the behavior instead