Added email features