added subscription management