Refactor subscriber operation in anticipation of bootstrapping