Refactored all of the Customer related fields and parameters.