Added dictionary and stuff