Refactoring to take advantage of bundled abstract file subscriber.