Hubs refactoring