Refactor - prevent duplicated addresses