GH539 - Refactor resourceSet to notificationChannel