Subscriber improvements