restored MessageFactory import