Added discriminators for system messages.