WIP Subscription editing support