Added support for EmailField