Make raw subscriptions more performant