Plugin updates

Hey Marc, can you check these changes?