Further improvements - handling private addresses added