More object streaming refactory.