Updated upstream plugin