Adding AD.Instances and removing old hacks.