minor refactoring for hubs on new sdk