Improve the userHub functions