Renamed attribute s/addressType/addressTypeCode and made some address fields required