First round of ION related updates