Refactoring Hub Module