Use updated plusplus plugin