Add support for optional plug-ins