Add authentication
Fix User model merge