Primed some components for new plugin requirements.