Refactored hub