Adding address handling