Added dictionary stuff