Make adding subscriptions non-blocking