Add support for Subscription metadata