Patch to add uid to message class to make it easier to track