Updating the architecture of the plugin final now testing it