Added some more information to the addresses