Added variable/parameter estimate matching via new struct