Updated to use string addresses.