Change structure from MPRester