Scaled back responsibility of .Net solution to just discovery.