Address Message ID Allocation

Now we have split the project into multiple modules we can no longer rely on the message IDs being allocated in a single location.