Added some missing AddressComponents