Extracting subscription overrides to new class