Update to use user model