Migrate S1125 to Subscription base Visitor