More infra on messaging