More work on subscriptions