Adds better address handling