[Core & CG] Update framework