MCore changes