Improved Hub responsiveness and review partial WIP