Migrated to simple User model