Split references to instances. Fix KeyDataManager.