Update factory classes to support private protocol stack.