Add support for initial and ending message.