More core updates