Wouldn't it be better to use the integration repository for the messages?
At least we're sure we're all using the same base..