CS-4704: add subscriptions to mapping