Modify MessageFactory