Added custom field handling and default email domain