[core] Simplify subscription handling