Address refactor