Some changes
User model added