Reworked Subscriber templates