diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 0000000..b63b642
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index f5b372c..0000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.12.5</checkstyleVersion>
-    <scanScope>JavaOnly</scanScope>
-    <copyLibs>true</copyLibs>
-    <option name="thirdPartyClasspath" />
-    <option name="activeLocationIds" />
-    <option name="locations">
-      <list>
-        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1a4e48d..376bbfe 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,14 +6,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="rets-io-client (1)" />
-        <module name="rets-io-common" />
         <module name="rets-io-validation" />
+        <module name="rets-io-common" />
         <module name="rets-io-client" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="Rets-Io" target="11" />
-    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 44f26a0..1067e4c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,11 +6,6 @@
       <option name="name" value="OSSEZ Private Snapshots" />
       <option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossrh-releases" />
-      <option name="name" value="ossrh Releases" />
-      <option name="url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="ossez-repo-releases" />
       <option name="name" value="OSSEZ Private Releases" />
@@ -21,40 +16,15 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.ossez.com/repository/maven-public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="Repository for JDK 1.4 builds" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="Repository for JDK 1.4 builds" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossrh-snapshots" />
-      <option name="name" value="OSSEZ Private Snapshots" />
-      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-central/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossrh-releases" />
-      <option name="name" value="ossrh Releases" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml
deleted file mode 100644
index 966d5f5..0000000
--- a/.idea/jpa-buddy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index f5f2744..0000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/thriftCompiler.xml b/.idea/thriftCompiler.xml
deleted file mode 100644
index 7bc123c..0000000
--- a/.idea/thriftCompiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ThriftCompiler">
-    <compilers />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index ce03a1e..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/validation" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/common/pom.xml b/common/pom.xml
index a3e17fc..565819f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.3</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3611628..5ab382c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
     <modules>
         <module>common</module>
         <module>client</module>
+        <module>validation</module>
     </modules>
 
     <dependencies>
@@ -327,7 +328,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.6.2</version>
                 <configuration>
                     <source>11</source>
                 </configuration>
diff --git a/validation/pom.xml b/validation/pom.xml
index f867008..c034bf3 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.ossez.usreio</groupId>
             <artifactId>rets-io-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -61,18 +61,6 @@
             <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.ossez.usreio</groupId>
-            <artifactId>rets-io-common</artifactId>
-            <version>0.0.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ossez.usreio</groupId>
-            <artifactId>rets-io-common</artifactId>
-            <version>0.0.2</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -88,19 +76,19 @@
                     <release>${java.version}</release>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-javadoc-plugin</artifactId>-->
+<!--                <version>3.3.2</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>attach-javadocs</id>-->
+<!--                        <goals>-->
+<!--                            <goal>jar</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
         </plugins>
 
     </build>
diff --git a/validation/src/main/java/org/realtor/rets/validation/ValidationExpressionEvaluator.java b/validation/src/main/java/org/realtor/rets/validation/ValidationExpressionEvaluator.java
index b4b6be9..e7dc879 100644
--- a/validation/src/main/java/org/realtor/rets/validation/ValidationExpressionEvaluator.java
+++ b/validation/src/main/java/org/realtor/rets/validation/ValidationExpressionEvaluator.java
@@ -1,4 +1,3 @@
-/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/ValidationExpressionEvaluator.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $  */
 package org.realtor.rets.validation;
 
 import org.realtor.rets.validation.operators.CloseParen;
diff --git a/validation/src/main/java/org/realtor/rets/validation/terms/BooleanTerm.java b/validation/src/main/java/org/realtor/rets/validation/terms/BooleanTerm.java
index 9d50dbc..0d9e474 100644
--- a/validation/src/main/java/org/realtor/rets/validation/terms/BooleanTerm.java
+++ b/validation/src/main/java/org/realtor/rets/validation/terms/BooleanTerm.java
@@ -1,14 +1,14 @@
-/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/terms/BooleanTerm.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $  */
 package org.realtor.rets.validation.terms;
 
 
 /**
- *  BooleanTerm.java Created Aug 25, 2003
+ * BooleanTerm.java Created Aug 25, 2003
+ * <p>
+ * <p>
+ * Copyright 2003, Avantia inc.
  *
- *
- *  Copyright 2003, Avantia inc.
- *  @version $Revision: 1.2 $
- *  @author scohen
+ * @author scohen
+ * @version $Revision: 1.2 $
  */
 public class BooleanTerm extends AbstractTerm {
     public BooleanTerm(boolean b) {
diff --git a/validation/src/main/java/org/realtor/rets/validation/terms/DateIntervalTerm.java b/validation/src/main/java/org/realtor/rets/validation/terms/DateIntervalTerm.java
index 1004081..3e12d3b 100644
--- a/validation/src/main/java/org/realtor/rets/validation/terms/DateIntervalTerm.java
+++ b/validation/src/main/java/org/realtor/rets/validation/terms/DateIntervalTerm.java
@@ -1,4 +1,4 @@
-/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/terms/DateIntervalTerm.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $  */
+
 package org.realtor.rets.validation.terms;
 
 import java.text.ParseException;
@@ -7,12 +7,13 @@ import java.util.regex.*;
 
 
 /**
- *  DateIntervalTerm.java Created Sep 17, 2003
+ * DateIntervalTerm.java Created Sep 17, 2003
+ * <p>
+ * <p>
+ * Copyright 2003, Avantia inc.
  *
- *
- *  Copyright 2003, Avantia inc.
- *  @version $Revision: 1.2 $
- *  @author scohen
+ * @author scohen
+ * @version $Revision: 1.2 $
  */
 public class DateIntervalTerm extends AbstractTerm {
     private static long MILLIS_PER_HOUR = 3600 * 1000;
@@ -37,7 +38,7 @@ public class DateIntervalTerm extends AbstractTerm {
     }
 
     /**
-     * @param l
+     * @param interval
      */
     public DateIntervalTerm(long interval) {
         this();
@@ -107,7 +108,7 @@ public class DateIntervalTerm extends AbstractTerm {
     }
 
     private void appendTimeUnit(StringBuffer toAppend, int time, String label,
-        boolean isTimeUnit) {
+                                boolean isTimeUnit) {
         if (time > 0) {
             if (isTimeUnit && (toAppend.indexOf("T") < 0)) {
                 toAppend.append("T");
@@ -118,9 +119,9 @@ public class DateIntervalTerm extends AbstractTerm {
         }
     }
 
+
     /**
-     * @param interval
-     * @return
+     * @throws ParseException
      */
     private void parseInterval() throws ParseException {
         String sVal = (String) getValue();
@@ -141,7 +142,7 @@ public class DateIntervalTerm extends AbstractTerm {
                 weeks = 0;
             } else {
                 throw new ParseException(sVal +
-                    " is not a valid Date interval", 0);
+                        " is not a valid Date interval", 0);
             }
         }
     }