Added support for emailProperty