Changes for subscription service