Proper subscription handling