diff --git a/.gitignore b/.gitignore
index d766a371d5faa0551b1710e36ed3e99e9837f97a..072864204f1e13172a5dc5e88526d30e01ad0271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,19 @@ composer.phar
 dist/**
 docs/**
 db/connector.s3db
+plugins/**
+!plugins/.gitkeep
+.idea/**
+logs/**
+!logs/.gitkeep
+config/**
+!config/.gitkeep
 install/db/*
-logs/*
 nbproject/**
 netbeans/**
 .htaccess
 .project
 .settings/**
-.idea/**
 tmp/**
 vendor/**
 *.sublime-project
diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/Mapper/PrimaryKeyMapper.php b/src/Mapper/PrimaryKeyMapper.php
index 27eb77eee953a29fd040cc523dca1eb4aa46008b..a5c8d4fc95dccfb3ca0fd84be0ed3893d46beccf 100644
--- a/src/Mapper/PrimaryKeyMapper.php
+++ b/src/Mapper/PrimaryKeyMapper.php
@@ -41,10 +41,13 @@ class PrimaryKeyMapper implements IPrimaryKeyMapper
      *
      * @param integer $hostId
      * @param integer $type
+     * @param string $relationType
      * @return string|null
      */
-    public function getEndpointId($hostId, $type)
+    public function getEndpointId($hostId, $type, $relationType = null)
     {
+        // @todo: type 16 (Image) switch via $relationType
+
         return $this->db->fetchSingle(sprintf('SELECT endpoint FROM mapping WHERE host = %s AND type = %s', $hostId, $type));
     }