Add support for subscription add-on names