Update to use HubUtility