UPR Converter -- Major overhaul of address handling