Added emails support