Improvements for subscription handling