Added index and zipcode