Refactored to add Hit.setup_field to reduce code duplication