Added CurrencyUnits & added more functionality to the Address object