Improve internal subscription management