Add support for optional message with service checks.