Added email and school to user model