diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/Experiment.java b/src/de/tud/kom/p2psim/impl/util/db/metric/Experiment.java
index 0609fd406a49bff71591f53ee98a4fa7dbaa9919..00150e4c74bf9ae7d2099c72e483a91c17f1c02e 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/Experiment.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/Experiment.java
@@ -8,6 +8,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
 import org.hibernate.annotations.Type;
 
 /** Database representation of an experiment, that is, a simulator run.
@@ -31,6 +32,7 @@ public class Experiment {
 	 */
 	@Id
 	@GeneratedValue
+	@Index(name = "id")
 	private int id;
 
 	/**
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/HostMetric.java b/src/de/tud/kom/p2psim/impl/util/db/metric/HostMetric.java
index e5480f218b20f9080e667c5e16d43c606015c287..3ce100bb725dfd78ff10191920aaff6a4c988970 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/HostMetric.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/HostMetric.java
@@ -7,6 +7,8 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
+
 @Entity
 @Table(name = "hostmetrics")
 /** Database mapping between metrics and hosts.
@@ -21,12 +23,14 @@ public class HostMetric {
 	@SuppressWarnings("unused")
 	@Id
 	@GeneratedValue
+	@Index(name = "id")
 	private int id;
 
 	private long hostId;
 
 	@ManyToOne
 	@JoinColumn(name = "metricId")
+	@Index(name = "metricId")
 	private Metric metric;
 
     protected HostMetric() {
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/Measurement.java b/src/de/tud/kom/p2psim/impl/util/db/metric/Measurement.java
index 0e067e94607a49b5e6991748c768ab1b14b141e6..899338f3dbc49e8476d4761d3f53038ba53b9fd9 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/Measurement.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/Measurement.java
@@ -9,6 +9,8 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
+
 /** Statistical representation of a series of measurements in the database.
  *
  * This class is a POJO that maps to a table in a database. Instances
@@ -26,6 +28,7 @@ public class Measurement implements HostMetricBound {
 	@SuppressWarnings("unused")
 	@Id
 	@GeneratedValue
+	@Index(name = "id")
 	private int id;
 
 	/**
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPair.java b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPair.java
index b489bea2c80eaa0238683bb8a130bf76096f2d40..6dbe8561ccaf75be04700a94765df64bd195ff02 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPair.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPair.java
@@ -8,6 +8,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -30,6 +31,7 @@ public class MeasurementPair {
 	@SuppressWarnings("unused")
 	@Id
 	@GeneratedValue()
+	@Index(name = "id")
 	private int id;
 
 	/**
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPairList.java b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPairList.java
index 0ca6ca86526e6a59d9f28825ad88d9d57b10099c..72bb88dc2aa894a8a111a2e7ef0edd0c7dee4922 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPairList.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPairList.java
@@ -8,6 +8,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -24,6 +25,7 @@ public class MeasurementPairList {
 	 */
 	@Id
 	@GeneratedValue()
+	@Index(name = "id")
 	private int id;
 
 	/**
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSingle.java b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSingle.java
index 0538d7a24ed87b115ec12cde743d6e397e8fc3ec..4bfe784fb56cb64c758efb744de33fafba3e2e13 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSingle.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSingle.java
@@ -8,6 +8,8 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
+
 /** Statistical representation of a series of measurements in the database.
  *
  * This class is a POJO that maps to a table in a database. Instances
@@ -51,6 +53,7 @@ public class MeasurementSingle {
 	@SuppressWarnings("unused")
 	@ManyToOne
 	@JoinColumn(name = "hostMetricId")
+	@Index(name = "hostMetricId")
 	private HostMetric hostMetric;
 
 	/**
diff --git a/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java b/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
index 3578cc23b1ef6cc0e83f1948b9fe42818dfcb363..9ef3de9efbf66a42a261ee9b57b6d3453272ed7d 100644
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
@@ -8,6 +8,8 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Index;
+
 /** Database representation of a metric.
  *
  * It is nearly an exact equivalent of {@link MetricDescription} but
@@ -29,6 +31,7 @@ public class Metric {
 	@SuppressWarnings("unused")
 	@Id
 	@GeneratedValue
+	@Index(name = "id")
 	private int id;
 
 	/**
@@ -65,6 +68,7 @@ public class Metric {
 	 */
 	@ManyToOne
 	@JoinColumn(name = "experimentId")
+	@Index(name = "experimentId")
 	private Experiment experiment;
 
 	/**