Updated to load a dictionary