Diffusion network framework and minor changes