Move address builder to utils