Added ordering to address lookup