Refactor contactable address set and update