CONN-651 PurposeForOfUse Changes