Added a mail field to users and contacts