Add Universities list and change geocode to address-based