Reworked subscription handling.