Further improvements - handling private addresses added, new diagrams