Added email and avatar fields