Update for new SB Core