Fixed Toolkit to reflect removal of getRawMessage()