added support for emails