Changed to defaultdict