Added dictionary & threading.