Subscription module updates #22