Subscription API handler change