Start using User record instead of UserID