Added optional plugins