Refactored name-value pairing.