Another overhaul of IOC interfaces