Updated withSubscription