Added email domain support