Added client-side subscriptions