Finish supporting multiple subscriptions