Changed subscription entity mapping to use channel and NT Ids rather
than names.