Updated MessageFactory's class method storage to work with class extensions