Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java	(revision 547)
@@ -9,6 +9,6 @@
 
 import de.ugoe.cs.quest.IReplayDecorator;
+import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.eventcore.IReplayable;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
 import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.Console;
@@ -19,4 +19,7 @@
  * if {@link ReplayableEvent}s.
  * </p>
+ * 
+ * TODO: Figure our how to handle {@link IReplayDecorator}
+ * TODO: Add appropriate checks if Events are replayable
  * 
  * @author Steffen Herbold
@@ -52,5 +55,5 @@
 	 */
 	public void createLogfileMultipleSessions(
-			Collection<List<ReplayableEvent<?>>> sequences, String filename) {
+			Collection<List<Event>> sequences, String filename) {
 		OutputStreamWriter writer = openReplayFile(filename);
 		if (writer != null) {
@@ -60,5 +63,5 @@
 					writer.write(decorator.getHeader());
 				}
-				for (List<ReplayableEvent<?>> actions : sequences) {
+				for (List<Event> actions : sequences) {
 					writeSession(actions, writer);
 				}
@@ -84,5 +87,5 @@
 	 *            name and path of the replay file
 	 */
-	public void createLogfileSingleSession(List<ReplayableEvent<?>> actions,
+	public void createLogfileSingleSession(List<Event> actions,
 			String filename) {
 		OutputStreamWriter writer = openReplayFile(filename);
@@ -152,10 +155,10 @@
 	 *             thrown if there is a problem writing to writer
 	 */
-	private void writeSession(List<ReplayableEvent<?>> actions,
+	private void writeSession(List<Event> actions,
 			OutputStreamWriter writer) throws IOException {
 		if (decorator != null) {
 			writer.write(decorator.getSessionHeader(sessionId));
 		}
-		for (ReplayableEvent<?> currentAction : actions) {
+		for (Event currentAction : actions) {
 
 			List<? extends IReplayable> replayables = currentAction
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java	(revision 547)
@@ -81,5 +81,5 @@
 			return;
 		}
-		Collection<List<? extends Event<?>>> sequences = (Collection<List<? extends Event<?>>>) dataObject;
+		Collection<List<Event>> sequences = (Collection<List<Event>>) dataObject;
 
 		TrieBasedModel model = createModel();
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java	(revision 547)
@@ -49,6 +49,6 @@
 
 		IStochasticProcess process = null;
-		Collection<List<? extends Event<?>>> observedSequences = null;
-		Collection<List<? extends Event<?>>> sequences = null;
+		Collection<List<Event>> observedSequences = null;
+		Collection<List<Event>> sequences = null;
 		Object dataObjectProcess = GlobalDataContainer.getInstance().getData(
 				modelname);
@@ -73,5 +73,5 @@
 		}
 		process = (IStochasticProcess) dataObjectProcess;
-		observedSequences = (Collection<List<? extends Event<?>>>) dataObjectObserved;
+		observedSequences = (Collection<List<Event>>) dataObjectObserved;
 
 		Console.print("seqName");
@@ -103,5 +103,5 @@
 				return;
 			}
-			sequences = (Collection<List<? extends Event<?>>>) dataObjectSequences;
+			sequences = (Collection<List<Event>>) dataObjectSequences;
 			Console.print(sequenceName);
 			for (int length = minLength; length <= maxLength; length++) {
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java	(revision 547)
@@ -68,5 +68,5 @@
 		DrawFromAllSequencesGenerator generator = new DrawFromAllSequencesGenerator(
 				numSequences, minLength, maxLength, validEnd, all);
-		Collection<List<? extends Event<?>>> sequences = generator
+		Collection<List<Event>> sequences = generator
 				.generateTestSuite(model);
 
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java	(revision 547)
@@ -78,5 +78,5 @@
 
 		// set up everything
-		List<List<? extends Event<?>>> allSequences = new LinkedList<List<? extends Event<?>>>();
+		List<List<Event>> allSequences = new LinkedList<List<Event>>();
 		for (int length = minLength; length <= maxLength; length++) {
 			if (validEnd) {
@@ -88,20 +88,20 @@
 		Console.traceln("" + allSequences.size() + " possible");
 
-		Collection<List<? extends Event<?>>> allSubSeqs = model
+		Collection<List<Event>> allSubSeqs = model
 				.generateSequences(coverageDepth);
-		Map<List<? extends Event<?>>, Double> weightMap = SequenceTools
+		Map<List<Event>, Double> weightMap = SequenceTools
 				.generateWeights(model, allSubSeqs);
-		Set<List<? extends Event<?>>> coveredSubSeqs = new LinkedHashSet<List<? extends Event<?>>>();
+		Set<List<Event>> coveredSubSeqs = new LinkedHashSet<List<Event>>();
 
-		List<Set<List<? extends Event<?>>>> containedSubSeqs = new LinkedList<Set<List<? extends Event<?>>>>();
-		for (List<? extends Event<?>> sequence : allSequences) {
-			List<List<? extends Event<?>>> wrapper = new LinkedList<List<? extends Event<?>>>();
+		List<Set<List<Event>>> containedSubSeqs = new LinkedList<Set<List<Event>>>();
+		for (List<Event> sequence : allSequences) {
+			List<List<Event>> wrapper = new LinkedList<List<Event>>();
 			wrapper.add(sequence);
-			Set<List<? extends Event<?>>> currentSubSeqs = SequenceTools
+			Set<List<Event>> currentSubSeqs = SequenceTools
 					.containedSubSequences(wrapper, coverageDepth);
 			containedSubSeqs.add(currentSubSeqs);
 		}
 
-		List<List<? extends Event<?>>> testSuite = new LinkedList<List<? extends Event<?>>>();
+		List<List<Event>> testSuite = new LinkedList<List<Event>>();
 		double currentCoverage = 0.0d;
 
@@ -112,10 +112,10 @@
 			Double[] sequenceGain = new Double[allSequences.size()];
 			int i = 0;
-			for (Set<List<? extends Event<?>>> containedSubSeq : containedSubSeqs) {
+			for (Set<List<Event>> containedSubSeq : containedSubSeqs) {
 				double gain = 0.0d;
-				Iterator<List<? extends Event<?>>> subSeqIter = containedSubSeq
+				Iterator<List<Event>> subSeqIter = containedSubSeq
 						.iterator();
 				while (subSeqIter.hasNext()) {
-					List<? extends Event<?>> subSeq = subSeqIter.next();
+					List<Event> subSeq = subSeqIter.next();
 					if (!coveredSubSeqs.contains(subSeq)) {
 						gain += weightMap.get(subSeq);
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java	(revision 547)
@@ -78,5 +78,5 @@
 		
 		HybridGenerator generator = new HybridGenerator(numSequences, length, maxLengthAll, validEnd);
-		Collection<List<? extends Event<?>>> sequences = generator.generateTestSuite(model);
+		Collection<List<Event>> sequences = generator.generateTestSuite(model);
 		
 		if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java	(revision 547)
@@ -8,5 +8,5 @@
 import de.ugoe.cs.quest.CommandHelpers;
 import de.ugoe.cs.quest.ReplayGenerator;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
+import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
@@ -67,9 +67,9 @@
 		}
 		model = (IStochasticProcess) dataObject;
-		Collection<List<ReplayableEvent<?>>> sequences = new LinkedList<List<ReplayableEvent<?>>>();
+		Collection<List<Event>> sequences = new LinkedList<List<Event>>();
 		try {
 			for (int i = 0; i < numSessions; i++) {
 				sequences
-						.add((List<ReplayableEvent<?>>) model.randomSequence());
+						.add((List<Event>) model.randomSequence());
 			}
 		} catch (ClassCastException e) {
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java	(revision 547)
@@ -69,5 +69,5 @@
 		RandomWalkGenerator generator = new RandomWalkGenerator(numSessions,
 				minLength, maxLength, validEnd, maxIter);
-		Collection<List<? extends Event<?>>> sequences = generator
+		Collection<List<Event>> sequences = generator
 				.generateTestSuite(model);
 
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java	(revision 547)
@@ -8,5 +8,5 @@
 import de.ugoe.cs.quest.ReplayGenerator;
 import de.ugoe.cs.quest.SequenceInstanceOf;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
+import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
@@ -50,5 +50,5 @@
 		}
 
-		Collection<List<ReplayableEvent<?>>> sequences = null;
+		Collection<List<Event>> sequences = null;
 		Object dataObject = GlobalDataContainer.getInstance().getData(
 				sequencesName);
@@ -63,5 +63,5 @@
 		}
 
-		sequences = (Collection<List<ReplayableEvent<?>>>) dataObject;
+		sequences = (Collection<List<Event>>) dataObject;
 		ReplayGenerator generator = new ReplayGenerator();
 		generator.createLogfileMultipleSessions(sequences, filename);
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java	(revision 547)
@@ -41,5 +41,5 @@
 		}
 
-		Collection<List<Event<?>>> sequences = null;
+		Collection<List<Event>> sequences = null;
 		Object dataObject = GlobalDataContainer.getInstance().getData(
 				sequencesName);
@@ -54,8 +54,8 @@
 		}
 
-		sequences = (Collection<List<Event<?>>>) dataObject;
+		sequences = (Collection<List<Event>>) dataObject;
 		Console.println("Number of Sequences: " + sequences.size());
 		SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();
-		for (List<Event<?>> sequence : sequences) {
+		for (List<Event> sequence : sequences) {
 			Integer currentSize = sequence.size();
 			if (lengthMap.containsKey(currentSize)) {
Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java
===================================================================
--- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java	(revision 539)
+++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java	(revision 547)
@@ -52,5 +52,5 @@
 			return;
 		}
-		Collection<List<? extends Event<?>>> sequences = (Collection<List<? extends Event<?>>>) dataObject;
+		Collection<List<Event>> sequences = (Collection<List<Event>>) dataObject;
 
 		dataObject = GlobalDataContainer.getInstance().getData(modelname);