Add support for optional plugins

Yikes, good catch.