Added email and exchange to build...