Make enhanced user model optional