Renamed address infill to addresses, removed additional unrequired charge proprietor array and made the proprietor infill plural