made address fields optional