Add support for optional plugins

Missing return.