Core Handler Update