diff --git a/src/OpenAC.Net.NFSe/Resources/Municipios.nfse b/src/OpenAC.Net.NFSe/Resources/Municipios.nfse
index 16342b44..e5cbe982 100644
--- a/src/OpenAC.Net.NFSe/Resources/Municipios.nfse
+++ b/src/OpenAC.Net.NFSe/Resources/Municipios.nfse
@@ -7064,7 +7064,7 @@
       <Nome>Jaú</Nome>
       <UF>SP</UF>
       <Provedor>Fiorilli</Provedor>
-      <Versao>2.00</Versao>
+      <Versao>2.01</Versao>
       <UrlHomologacao>
         <Item>
           <TipoUrl>Enviar</TipoUrl>
diff --git a/src/OpenAC.Net.NFSe/Schemas/Fiorilli/2.00/nfse.xsd b/src/OpenAC.Net.NFSe/Schemas/Fiorilli/2.00/nfse.xsd
index 083575a7..e2e6e198 100644
--- a/src/OpenAC.Net.NFSe/Schemas/Fiorilli/2.00/nfse.xsd
+++ b/src/OpenAC.Net.NFSe/Schemas/Fiorilli/2.00/nfse.xsd
@@ -309,7 +309,7 @@
 				minOccurs="0" maxOccurs="1" />
 			<xsd:element name="Uf" type="tsUf" minOccurs="0"
 				maxOccurs="1" />
-			<xsd:element name="CodigoPais" type="tsCodigoPaisBacen"
+			<xsd:element name="CodigoPais" type="tsCodigoMunicipioIbge"
 				minOccurs="0" maxOccurs="1" />
 			<xsd:element name="Cep" type="tsCep" minOccurs="0"
 				maxOccurs="1" />
@@ -499,7 +499,7 @@
 		<xsd:sequence>
 			<xsd:element name="IdentificacaoRps" type="tcIdentificacaoRps"
 				minOccurs="1" maxOccurs="1" />
-			<xsd:element name="DataEmissao" type="xsd:date"
+			<xsd:element name="DataEmissao" type="xsd:dateTime"
 				minOccurs="1" maxOccurs="1" />
 			<xsd:element name="Status" type="tsStatusRps" minOccurs="1"
 				maxOccurs="1" />
@@ -513,7 +513,7 @@
 		<xsd:sequence>
 			<xsd:element name="Rps" type="tcInfRps" 
 				minOccurs="0" maxOccurs="1" />
-			<xsd:element name="Competencia" type="xsd:date"
+			<xsd:element name="Competencia" type="xsd:dateTime"
 				minOccurs="1" maxOccurs="1" />
 			<xsd:element name="Servico" type="tcDadosServico"
 				minOccurs="1" maxOccurs="1" />
@@ -532,14 +532,13 @@
 			<xsd:element name="IncentivoFiscal" type="tsSimNao"
 				minOccurs="1" maxOccurs="1" />
 		</xsd:sequence>
-		<xsd:attribute name="Id" type="tsIdTag" />
 	</xsd:complexType>
 
 	<xsd:complexType name="tcDeclaracaoPrestacaoServico">
 		<xsd:sequence>
 			<xsd:element name="InfDeclaracaoPrestacaoServico" type="tcInfDeclaracaoPrestacaoServico" minOccurs="1"
 				maxOccurs="1" />
-			<xsd:element ref="dsig:Signature" minOccurs="0"
+			<xsd:element ref="dsig:Signature" minOccurs="1"
 				maxOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
@@ -573,7 +572,7 @@
 				minOccurs="1" maxOccurs="1" />
 			<xsd:element name="ValorCredito" type="tsValor"
 				minOccurs="0" maxOccurs="1" />
-			<xsd:element name="PrestadorServico" type="tcDadosPrestador"
+			<xsd:element name="EnderecoPrestadorServico" type="tcEndereco"
 				minOccurs="1" maxOccurs="1" />
 			<xsd:element name="OrgaoGerador" type="tcIdentificacaoOrgaoGerador"
 				minOccurs="1" maxOccurs="1" />
@@ -606,7 +605,7 @@
 		<xsd:sequence>
 			<xsd:element name="InfPedidoCancelamento" type="tcInfPedidoCancelamento"
 				minOccurs="1" maxOccurs="1" />
-			<xsd:element ref="dsig:Signature" minOccurs="0"
+			<xsd:element ref="dsig:Signature" minOccurs="1"
 				maxOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
@@ -621,6 +620,15 @@
 		<xsd:attribute name="Id" type="tsIdTag" />
 	</xsd:complexType>
 
+	<xsd:element name="RetCancelamento">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="NfseCancelamento" type="tcCancelamentoNfse"
+					minOccurs="1" maxOccurs="unbounded" />
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+
 	<xsd:complexType name="tcCancelamentoNfse">
 		<xsd:sequence>
 			<xsd:element name="Confirmacao" type="tcConfirmacaoCancelamento"
@@ -631,14 +639,6 @@
 		<xsd:attribute name="versao" type="tsVersao" use="required" />
 	</xsd:complexType>
 
-	<xsd:complexType name="tcRetCancelamento">
-		<xsd:sequence>
-			<xsd:element name="NfseCancelamento" type="tcCancelamentoNfse" minOccurs="1" maxOccurs="1" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-
 	<xsd:complexType name="tcInfSubstituicaoNfse">
 		<xsd:sequence>
 			<xsd:element name="NfseSubstituidora" type="tsNumeroNfse"
@@ -704,7 +704,7 @@
 				<xsd:complexType>
 					<xsd:sequence>
 						<xsd:element name="Rps" type="tcDeclaracaoPrestacaoServico"
-							minOccurs="1" maxOccurs="unbounded" >
+							minOccurs="1" >
 						</xsd:element>
 					</xsd:sequence>
 				</xsd:complexType>
@@ -757,7 +757,7 @@
 		<xsd:complexType>
 			<xsd:sequence>
 				<xsd:element name="LoteRps" type="tcLoteRps" />
-				<xsd:element ref="dsig:Signature" minOccurs="0"
+				<xsd:element ref="dsig:Signature" minOccurs="1"
 					maxOccurs="1" />
 			</xsd:sequence>
 		</xsd:complexType>
@@ -784,7 +784,7 @@
 		<xsd:complexType>
 			<xsd:sequence>
 				<xsd:element name="LoteRps" type="tcLoteRps" />
-				<xsd:element ref="dsig:Signature" minOccurs="0"
+				<xsd:element ref="dsig:Signature" minOccurs="1"
 					maxOccurs="1" />
 			</xsd:sequence>
 		</xsd:complexType>
@@ -858,8 +858,10 @@
 	<xsd:element name="CancelarNfseResposta">
 		<xsd:complexType>
 			<xsd:choice>
-				<xsd:element name="RetCancelamento" type="tcRetCancelamento" minOccurs="1" maxOccurs="1" />
-				<xsd:element ref="ListaMensagemRetorno" minOccurs="1" maxOccurs="1" />
+				<xsd:element ref="RetCancelamento" minOccurs="1"
+					maxOccurs="1" />
+				<xsd:element ref="ListaMensagemRetorno" minOccurs="1"
+					maxOccurs="1" />
 			</xsd:choice>
 		</xsd:complexType>
 	</xsd:element>