-- Added parsing of exchange addresses, to refine