more updates around plugin_loader