Add Subscription metadata support