Changes to Hub code