Add MessageFactory