Added originalHost field to capture mapping