Updated to include new plugins