adding compatibility for subscriptions v2.1