Refactored subscriptions handling