diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/io/api/metadata/MetaDataSource.java b/gradoop-flink/src/main/java/org/gradoop/flink/io/api/metadata/MetaDataSource.java
index bc26ee09cda7..64f33be20b03 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/io/api/metadata/MetaDataSource.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/io/api/metadata/MetaDataSource.java
@@ -25,8 +25,8 @@
 import org.gradoop.common.model.impl.metadata.PropertyMetaData;
 import org.gradoop.flink.io.api.metadata.functions.ElementToPropertyMetaData;
 import org.gradoop.flink.io.api.metadata.functions.ReducePropertyMetaData;
+import org.gradoop.flink.model.api.epgm.BaseGraph;
 import org.gradoop.flink.model.api.epgm.BaseGraphCollection;
-import org.gradoop.flink.model.impl.epgm.LogicalGraph;
 import org.gradoop.flink.util.GradoopFlinkConfig;
 
 import java.io.IOException;
@@ -59,7 +59,7 @@ public interface MetaDataSource<M extends MetaData> {
    * @param graph logical graph
    * @return meta data information
    */
-  default DataSet<Tuple3<String, String, String>> tuplesFromGraph(LogicalGraph graph) {
+  default DataSet<Tuple3<String, String, String>> tuplesFromGraph(BaseGraph<?, ?, ?, ?, ?> graph) {
     return tuplesFromElements(graph.getVertices())
       .union(tuplesFromElements(graph.getEdges()));
   }
@@ -78,10 +78,10 @@ default DataSet<Tuple3<String, String, String>> tuplesFromCollection(
   }
 
   /**
-   * Creates the meta data for the specified data set of EPGM elements.
+   * Creates the meta data for the specified data set of elements.
    *
-   * @param elements EPGM elements
-   * @param <E>      EPGM element type
+   * @param elements elements
+   * @param <E>      element type
    * @return meta data information
    */
   static <E extends Element> DataSet<Tuple3<String, String, String>> tuplesFromElements(