added custom email field support