Refactor address info on its on type