Refactored for Customer Field Value converter and test.