added ability to set the original host from a system property
adding static additional fields etc