Refactored address utils