Update Rework for core-board