Merged AppUsers and TenantUsers into one User model