Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java
===================================================================
--- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java	(revision 518)
+++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java	(revision 547)
@@ -26,5 +26,5 @@
 	 * </p>
 	 */
-	private final Collection<List<? extends Event<?>>> sequences;
+	private final Collection<List<Event>> sequences;
 
 	/**
@@ -33,5 +33,5 @@
 	 * </p>
 	 */
-	private final Collection<List<? extends Event<?>>> observedSequences;
+	private final Collection<List<Event>> observedSequences;
 
 	/**
@@ -48,5 +48,5 @@
 	 * </p>
 	 */
-	private Collection<List<? extends Event<?>>> subSeqsGenerated = null;
+	private Collection<List<Event>> subSeqsGenerated = null;
 
 	/**
@@ -55,5 +55,5 @@
 	 * </p>
 	 */
-	private Collection<List<? extends Event<?>>> subSeqsObserved = null;
+	private Collection<List<Event>> subSeqsObserved = null;
 
 	/**
@@ -77,6 +77,6 @@
 	 */
 	public CoverageCalculatorObserved(
-			Collection<List<? extends Event<?>>> observedSequences,
-			Collection<List<? extends Event<?>>> sequences, int length) {
+			Collection<List<Event>> observedSequences,
+			Collection<List<Event>> sequences, int length) {
 		if (observedSequences == null) {
 			throw new InvalidParameterException(
@@ -105,5 +105,5 @@
 	public double getCoverageObserved() {
 		createSubSeqs();
-		Collection<List<? extends Event<?>>> subSeqsObservedCopy = new LinkedHashSet<List<? extends Event<?>>>(
+		Collection<List<Event>> subSeqsObservedCopy = new LinkedHashSet<List<Event>>(
 				subSeqsObserved);
 		subSeqsObservedCopy.retainAll(subSeqsGenerated);
@@ -125,12 +125,12 @@
 	public double getCoverageObservedWeigth(IStochasticProcess process) {
 		createSubSeqs();
-		Map<List<? extends Event<?>>, Double> weightMap = SequenceTools
+		Map<List<Event>, Double> weightMap = SequenceTools
 				.generateWeights(process, subSeqsObserved);
 
-		Collection<List<? extends Event<?>>> subSeqsObservedCopy = new LinkedHashSet<List<? extends Event<?>>>(
+		Collection<List<Event>> subSeqsObservedCopy = new LinkedHashSet<List<Event>>(
 				subSeqsObserved);
 		subSeqsObservedCopy.retainAll(subSeqsGenerated);
 		double weight = 0.0d;
-		for (List<? extends Event<?>> subSeq : subSeqsObservedCopy) {
+		for (List<Event> subSeq : subSeqsObservedCopy) {
 			weight += weightMap.get(subSeq);
 		}
@@ -149,5 +149,5 @@
 	public double getNewPercentage() {
 		createSubSeqs();
-		Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
+		Collection<List<Event>> subSeqsGeneratedCopy = new LinkedHashSet<List<Event>>(
 				subSeqsGenerated);
 		subSeqsGeneratedCopy.removeAll(subSeqsObserved);
@@ -174,7 +174,7 @@
 		}
 		createSubSeqs();
-		Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
-				subSeqsGenerated);
-		Collection<List<? extends Event<?>>> subSeqsPossible = process
+		Collection<List<Event>> subSeqsGeneratedCopy = new LinkedHashSet<List<Event>>(
+				subSeqsGenerated);
+		Collection<List<Event>> subSeqsPossible = process
 				.generateSequences(length);
 		subSeqsGeneratedCopy.removeAll(subSeqsObserved);
@@ -204,14 +204,14 @@
 		}
 		createSubSeqs();
-		Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
-				subSeqsGenerated);
-		Collection<List<? extends Event<?>>> subSeqsPossible = process
+		Collection<List<Event>> subSeqsGeneratedCopy = new LinkedHashSet<List<Event>>(
+				subSeqsGenerated);
+		Collection<List<Event>> subSeqsPossible = process
 				.generateSequences(length);
 		subSeqsGeneratedCopy.removeAll(subSeqsObserved);
 		subSeqsPossible.removeAll(subSeqsObserved);
-		Map<List<? extends Event<?>>, Double> weightMap = SequenceTools
+		Map<List<Event>, Double> weightMap = SequenceTools
 				.generateWeights(process, subSeqsPossible);
 		double weight = 0.0d;
-		for (List<? extends Event<?>> subSeq : subSeqsGeneratedCopy) {
+		for (List<Event> subSeq : subSeqsGeneratedCopy) {
 			Double currentWeight = weightMap.get(subSeq);
 			if( currentWeight!=null ) {
@@ -248,5 +248,5 @@
 	public int getNumNew() {
 		createSubSeqs();
-		Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
+		Collection<List<Event>> subSeqsGeneratedCopy = new LinkedHashSet<List<Event>>(
 				subSeqsGenerated);
 		subSeqsGeneratedCopy.removeAll(subSeqsObserved);
Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java
===================================================================
--- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java	(revision 518)
+++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java	(revision 547)
@@ -33,5 +33,5 @@
 	 * </p>
 	 */
-	private Collection<List<? extends Event<?>>> sequences;
+	private Collection<List<Event>> sequences;
 
 	/**
@@ -48,5 +48,5 @@
 	 * </p>
 	 */
-	private Collection<List<? extends Event<?>>> containedSubSeqs = null;
+	private Collection<List<Event>> containedSubSeqs = null;
 
 	/**
@@ -56,5 +56,5 @@
 	 * </p>
 	 */
-	private Collection<List<? extends Event<?>>> allPossibleSubSeqs = null;
+	private Collection<List<Event>> allPossibleSubSeqs = null;
 
 	/**
@@ -64,5 +64,5 @@
 	 * </p>
 	 */
-	private Map<List<? extends Event<?>>, Double> subSeqWeights = null;
+	private Map<List<Event>, Double> subSeqWeights = null;
 
 	/**
@@ -85,5 +85,5 @@
 	 */
 	public CoverageCalculatorProcess(IStochasticProcess process,
-			Collection<List<? extends Event<?>>> sequences, int length) {
+			Collection<List<Event>> sequences, int length) {
 		if (process == null) {
 			throw new InvalidParameterException("process must not be null");
@@ -159,5 +159,5 @@
 		}
 		double weight = 0.0;
-		for (List<? extends Event<?>> subSeq : containedSubSeqs) {
+		for (List<Event> subSeq : containedSubSeqs) {
 			Double curWeight = subSeqWeights.get(subSeq);
 			if( curWeight!=null ) {
@@ -208,5 +208,5 @@
 	 *             thrown is newSequences is null
 	 */
-	public void setSequences(Collection<List<? extends Event<?>>> newSequences) {
+	public void setSequences(Collection<List<Event>> newSequences) {
 		if (newSequences == null) {
 			throw new InvalidParameterException("sequences must not be null");
Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java
===================================================================
--- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java	(revision 518)
+++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java	(revision 547)
@@ -46,12 +46,12 @@
 	 * @return {@link Map} of weights
 	 */
-	public static Map<List<? extends Event<?>>, Double> generateWeights(
+	public static Map<List<Event>, Double> generateWeights(
 			IStochasticProcess process,
-			Collection<List<? extends Event<?>>> sequences) {
-		Map<List<? extends Event<?>>, Double> subSeqWeights = new LinkedHashMap<List<? extends Event<?>>, Double>();
+			Collection<List<Event>> sequences) {
+		Map<List<Event>, Double> subSeqWeights = new LinkedHashMap<List<Event>, Double>();
 		if (sequences != null && !sequences.isEmpty()) {
 			if (process != null) {
 				double sum = 0.0;
-				for (List<? extends Event<?>> sequence : sequences) {
+				for (List<Event> sequence : sequences) {
 					double prob = process.getProbability(sequence);
 					subSeqWeights.put(sequence, prob);
@@ -59,5 +59,5 @@
 				}
 				if (sum < 1.0) {
-					for (Map.Entry<List<? extends Event<?>>, Double> entry : subSeqWeights
+					for (Map.Entry<List<Event>, Double> entry : subSeqWeights
 							.entrySet()) {
 						entry.setValue(entry.getValue() / sum);
@@ -65,5 +65,5 @@
 				}
 			} else {
-				for( List<? extends Event<?>> sequence : sequences ) {
+				for( List<Event> sequence : sequences ) {
 					subSeqWeights.put(sequence, 0.0d);
 				}
@@ -114,16 +114,16 @@
 	 *             thrown if length less or equal to 0
 	 */
-	public static Set<List<? extends Event<?>>> containedSubSequences(
-			Collection<List<? extends Event<?>>> sequences, int length) {
+	public static Set<List<Event>> containedSubSequences(
+			Collection<List<Event>> sequences, int length) {
 		if (length <= 0) {
 			throw new InvalidParameterException(
 					"length must be a positive integer");
 		}
-		Set<List<? extends Event<?>>> containedSubSeqs = new LinkedHashSet<List<? extends Event<?>>>();
+		Set<List<Event>> containedSubSeqs = new LinkedHashSet<List<Event>>();
 		if (sequences != null) {
-			for (List<? extends Event<?>> sequence : sequences) {
-				List<Event<?>> subSeq = new LinkedList<Event<?>>();
+			for (List<Event> sequence : sequences) {
+				List<Event> subSeq = new LinkedList<Event>();
 				boolean minLengthReached = false;
-				for (Event<?> event : sequence) {
+				for (Event event : sequence) {
 					subSeq.add(event);
 					if (!minLengthReached) {
@@ -136,5 +136,5 @@
 					if (minLengthReached) {
 						if (!containedSubSeqs.contains(subSeq)) {
-							containedSubSeqs.add(new LinkedList<Event<?>>(
+							containedSubSeqs.add(new LinkedList<Event>(
 									subSeq));
 						}