Adds support for singular vs multi results messages.