Added bairros and improvements to the address format