Updates to message send / receive