Added multiple data distribution support