Update for core-board