Add support for optional plugins