Updated to include a few plugins