diff --git a/pom.xml b/pom.xml
index e697f511..08237926 100755
--- a/pom.xml
+++ b/pom.xml
@@ -209,8 +209,12 @@
           <apiSources>
             <apiSource>
               <springmvc>false</springmvc>
-              <locations>org.agoncal.application.petstore.rest</locations>
-              <schemes>http,https</schemes>
+              <locations>
+                <location>org.agoncal.application.petstore.rest</location>
+              </locations>
+              <schemes>
+                <scheme>http,https</scheme>
+              </schemes>
               <host>localhost:8080</host>
               <basePath>/applicationPetstore/rest</basePath>
               <outputFormats>json</outputFormats>
@@ -245,6 +249,11 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+          <groupId>org.wildfly.plugins</groupId>
+          <artifactId>wildfly-maven-plugin</artifactId>
+          <version>1.2.1.Final</version>
+      </plugin>
     </plugins>
   </build>
 
@@ -336,4 +345,4 @@
     </repository>
   </repositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/org/agoncal/application/petstore/model/Address.java b/src/main/java/org/agoncal/application/petstore/model/Address.java
old mode 100644
new mode 100755
index 69956db1..99e094f5
--- a/src/main/java/org/agoncal/application/petstore/model/Address.java
+++ b/src/main/java/org/agoncal/application/petstore/model/Address.java
@@ -43,7 +43,7 @@ public class Address implements Serializable
    @NotNull
    private String zipcode;
 
-   @ManyToOne(cascade = CascadeType.PERSIST)
+   @ManyToOne
    private Country country = new Country();
 
    // ======================================
diff --git a/src/main/java/org/agoncal/application/petstore/model/Item.java b/src/main/java/org/agoncal/application/petstore/model/Item.java
index 18e069c8..c2593e5b 100644
--- a/src/main/java/org/agoncal/application/petstore/model/Item.java
+++ b/src/main/java/org/agoncal/application/petstore/model/Item.java
@@ -58,7 +58,7 @@ public class Item implements Serializable
    @Price
    private Float unitCost;
 
-   @ManyToOne(cascade = CascadeType.PERSIST)
+   @ManyToOne
    @JoinColumn(name = "product_fk", nullable = false)
    @XmlTransient
    private Product product;
diff --git a/src/main/java/org/agoncal/application/petstore/service/CustomerService.java b/src/main/java/org/agoncal/application/petstore/service/CustomerService.java
index bff7dc31..539a1518 100755
--- a/src/main/java/org/agoncal/application/petstore/service/CustomerService.java
+++ b/src/main/java/org/agoncal/application/petstore/service/CustomerService.java
@@ -65,8 +65,6 @@ public boolean doesLoginAlreadyExist(@NotNull String login)
 
    public Customer createCustomer(@NotNull Customer customer)
    {
-      Country country = entityManager.find(Country.class, customer.getHomeAddress().getCountry().getId());
-      customer.getHomeAddress().setCountry(country);
       entityManager.persist(customer);
       return customer;
    }