Update Core Class structure