Index: autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationFacade.java
===================================================================
--- autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationFacade.java	(revision 1032)
+++ autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationFacade.java	(revision 1033)
@@ -5,4 +5,5 @@
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 
@@ -24,18 +25,15 @@
     }
 
+    @AllArgsConstructor
     protected static class ExecuteUsabilityEvaluationStep {
 	
-	private UsabilityRuleset usabilityRuleset;
-
-	public ExecuteUsabilityEvaluationStep(UsabilityRuleset usabilityRuleset) {
-	    this.usabilityRuleset = usabilityRuleset;
-	}
+	private final UsabilityRuleset usabilityRuleset;
 
 	public UsabilityEvaluationReport evaluateUsabilityOf(ITaskTree taskTree) {
 	    Preconditions.checkNotNull(taskTree);
-	    EnumSet<? extends UsabilityRule> rulesetForUsabilityEvaluation = usabilityRuleset.getRulesetForUsabilityEvaluation();
+	    EnumSet<? extends UsabilityRule> evaluationRules = usabilityRuleset.evaluationRules();
 	    List<UsabilityDefect> evaluationResults = 
-		    Lists.newArrayListWithCapacity(rulesetForUsabilityEvaluation.size());
-	    for(UsabilityRule usabilityRule : rulesetForUsabilityEvaluation) {
+		    Lists.newArrayListWithCapacity(evaluationRules.size());
+	    for(UsabilityRule usabilityRule : evaluationRules) {
 		Optional<UsabilityDefect> ruleEvaluationResult = usabilityRule.evaluate(taskTree);
 		if(ruleEvaluationResult.isPresent()) {