Move address helpers into a module for external use