Export core to easy upgrade