Index: BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java
===================================================================
--- BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 19)
+++ BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 20)
@@ -61,5 +61,5 @@
 
 		System.out.println("CLS");
-		ClassLink[] cls = builder.getNextClass(null, clz[0].getClassURI(), 0);
+		ClassLink[] cls = builder.getNextClass(null, clz[0].getClassURI(), 0, false);
 		if( cls != null ){
 			for( ClassLink cl: cls){
@@ -272,11 +272,18 @@
 	 */
 	public ClassLink[] getNextClass(String[] graphURIs, String originClass,
-			int limit) throws Exception {
+			int limit, boolean countLinks) throws Exception {
 		StringBuffer queryStr = new StringBuffer();
 		queryStr.append("PREFIX owl: <http://www.w3.org/2002/07/owl#>\n");
 		queryStr.append("PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n");
 		queryStr.append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n");
-//		queryStr.append("SELECT DISTINCT ?p ?pDirection ?c (COUNT(?s) AS ?numOfLinks) \n");
-		queryStr.append("SELECT DISTINCT ?p ?pDirection ?c \n");
+
+		// SELECT
+		if( countLinks ){
+				queryStr.append("SELECT DISTINCT ?p ?pDirection ?c (COUNT(?s) AS ?numOfLinks) \n");
+		}
+		else{
+			queryStr.append("SELECT DISTINCT ?p ?pDirection ?c \n");
+		}
+		
 		if (graphURIs != null) {
 			for (String graphURI : graphURIs) {
@@ -291,5 +298,9 @@
 		queryStr.append(originClass);
 		queryStr.append(">.\n    ?p rdfs:range ?c.\n");
-//		queryStr.append("    ?o ?p ?s.");
+
+		if( countLinks ){
+				queryStr.append("    ?o ?p ?s.");
+		}
+		
 		queryStr.append("}\n  UNION\n");
 		queryStr.append("  { ?p rdfs:range <");
@@ -297,5 +308,9 @@
 		queryStr.append(">.\n");
 		queryStr.append("    ?p rdfs:domain ?c.\n");
-//		queryStr.append("    ?s ?p ?o.");
+
+		if( countLinks ){
+				queryStr.append("    ?s ?p ?o.");
+		}
+		
 		queryStr.append("}\n");
 
@@ -304,9 +319,14 @@
 		
 		queryStr.append("  ?s rdf:type ?c.\n");
-//		queryStr.append("  ?o rdf:type <");
-//		queryStr.append(originClass);
-//		queryStr.append(">.\n");
-		queryStr.append("}\n");
-//		queryStr.append("GROUP BY ?p ?pDirection ?c\n");
+
+		if( countLinks){
+			queryStr.append("  ?o rdf:type <");
+			queryStr.append(originClass);
+			queryStr.append(">.\n");
+			queryStr.append("}\nGROUP BY ?p ?pDirection ?c\n");
+		}
+		else{
+			queryStr.append("}\n");
+		}
 		if (limit > 0) {
 			queryStr.append("limit ");
@@ -602,5 +622,4 @@
 		ResultSet results = qexec.execSelect();
 		HashMap<String, LabelMap> lMap = new HashMap<String, LabelMap>();
-		HashMap<String, InstanceLink> insLinkMap = new HashMap<String, InstanceLink>();
 		for (; results.hasNext();) {
 			QuerySolution sol = results.next();
@@ -623,6 +642,4 @@
 		}
 		return lMap.values().toArray(new LabelMap[0]);
-		
-		
 	}
 	
Index: BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java
===================================================================
--- BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java (revision 10)
+++ BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java (revision 20)
@@ -59,5 +59,5 @@
 	 * @since 28.01.2014
 	 */
-	public ClassLink[] getNextClass(String[] graphURIs, String originClass, int limit) throws Exception;
+	public ClassLink[] getNextClass(String[] graphURIs, String originClass, int limit, boolean countLinks) throws Exception;
 
 	/**
@@ -73,4 +73,5 @@
 	 * @param originClass 襍ｷ轤ｹ縺ｨ縺ｪ繧九け繝ｩ繧ｹ縺ｮURI縲€��ull荳榊庄��
 	 * @param limit 隗｣縺ｨ縺励※霑斐＆繧後ｋClassLink驟榊�縺ｮ髟ｷ縺輔�荳企剞蛟､繧呈欠螳壹☆繧九€�荳企剞蛟､繧定ｨｭ螳壹＠縺ｪ縺�ｴ蜷医�0莉･荳九�蛟､繧呈欠螳壹☆繧�
+	 * @param countLinks 繧､繝ｳ繧ｹ繧ｿ繝ｳ繧ｹ髢薙�繝ｪ繝ｳ繧ｯ縺ｮ謨ｰ�医ヨ繝ｪ繝励Ν謨ｰ�峨ｒ霑斐＠縺溘＞縺ｨ縺阪�true繧呈欠螳壹☆繧�
 	 * @return ClassLink縺ｮ驟榊�縲ゅ％縺薙↓縺ｯ縲∝叙蠕励＆繧後◆繧ｯ繝ｩ繧ｹ縺ｨ髢｢菫ゅ▼縺代ｉ繧後※縺�ｋ繝励Ο繝代ユ繧｣縲�未菫ゅ�蜷代″縺悟性縺ｾ繧後ｋ縲�
 	 * @throws Exception
@@ -101,3 +102,5 @@
  InstanceLink[] getNextInstancesViaInstanceLink(String[] graphURIs, String originInstance,
 			int limit) throws Exception;
+	public LabelMap[] getLabels(String[] graphURIs, String[] resourceURIs, String language) throws Exception;
+
 }