Changes to account for new Ivar class