Move the cyclic function call to the plugin class for now