Some updates on listing addresses