Adapted to changes in GDCore.