Finished plugin template / rawMessage additions