Phase-2 Upgrade

GPTKB entity