Update to support Dream/Client split.