Changes to logic to parse old fundamental data