Added "email" to user class and various functions