more ICore changes