Added email field support