Updated to allow making the address fields not required