diff --git a/pom.xml b/pom.xml
index 203fd8430..cab35bcba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,12 +168,22 @@
 			<groupId>javax.persistence</groupId>
 			<artifactId>persistence-api</artifactId>
 			<version>2.0</version>
+		</dependency>		
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-core</artifactId>
+			<version>3.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers</artifactId>
 			<version>3.0.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>snappy</artifactId>
+			<version>1.0.1-rc4</version>
+		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
@@ -269,24 +279,12 @@
 			<version>3.2.2</version>
 		</dependency>
 
-		<!-- MongoDB depndencies -->
 		<dependency>
 			<groupId>com.mongodb</groupId>
 			<artifactId>mongo</artifactId>
 			<version>2.5.3</version>
 		</dependency>
-
-		<!-- System dependencies -->
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>snappy</artifactId>
-			<version>1.0.1-rc4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>3.2.0</version>
-		</dependency>
+		
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/src/main/java/com/impetus/kundera/property/PropertyAccessorHelper.java b/src/main/java/com/impetus/kundera/property/PropertyAccessorHelper.java
index 823f43c5d..8bf6c53bf 100644
--- a/src/main/java/com/impetus/kundera/property/PropertyAccessorHelper.java
+++ b/src/main/java/com/impetus/kundera/property/PropertyAccessorHelper.java
@@ -24,9 +24,9 @@
 
 import javax.persistence.PersistenceException;
 
-import org.hsqldb.lib.HashSet;
+import java.util.HashSet;
 
-import antlr.collections.List;
+import java.util.List;
 
 import com.impetus.kundera.metadata.EntityMetadata;
 import com.impetus.kundera.utils.ReflectUtils;