Minor changes in MessageFactory