Index: src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp
===================================================================
--- src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp	(revision 3a4be0dfdbe8f8c566c8fc42b0e9a6c0a2bf76b6)
+++ src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp	(revision 33e80133683ce15eb991faac6abc6d540afee182)
@@ -164,3 +164,17 @@
 };
 
+class CommandLineDialog::KeyValuePairCommandLineQuery : public Dialog::TQuery<KeyValuePair> {
+public:
+  KeyValuePairCommandLineQuery(Parameter<KeyValuePair> &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~KeyValuePairCommandLineQuery();
+  virtual bool handle();
+};
+
+class CommandLineDialog::KeyValuePairsCommandLineQuery : public Dialog::TQuery<std::vector<KeyValuePair> > {
+public:
+  KeyValuePairsCommandLineQuery(Parameter<std::vector<KeyValuePair> > &_param, const std::string &_title, const std::string &_description = "");
+  virtual ~KeyValuePairsCommandLineQuery();
+  virtual bool handle();
+};
+
 #endif /* COMMANDLINEQUERY_HPP_ */
Index: src/UIElements/CommandLineUI/Query/KeyValuePairCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/KeyValuePairCommandLineQuery.cpp	(revision 33e80133683ce15eb991faac6abc6d540afee182)
+++ src/UIElements/CommandLineUI/Query/KeyValuePairCommandLineQuery.cpp	(revision 33e80133683ce15eb991faac6abc6d540afee182)
@@ -0,0 +1,63 @@
+/*
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2015 Frederik Heber. All rights reserved.
+ * 
+ *
+ *   This file is part of MoleCuilder.
+ *
+ *    MoleCuilder is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    MoleCuilder is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with MoleCuilder.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * KeyValuePairCommandLineQuery.cpp
+ *
+ *  Created on: May 16, 2015
+ *      Author: heber
+ */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "CodePatterns/MemDebug.hpp"
+
+#include "Actions/Values.hpp"
+#include "CommandLineUI/Query/CommandLineQuery.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
+#include "CodePatterns/Log.hpp"
+#include "CodePatterns/Verbose.hpp"
+
+#include "Parameters/Specifics/KeyValuePair.hpp"
+
+CommandLineDialog::KeyValuePairCommandLineQuery::KeyValuePairCommandLineQuery(Parameter<KeyValuePair> &_param, const std::string &_title, const std::string &_description) :
+    Dialog::TQuery<KeyValuePair>(_param, _title, _description)
+{}
+
+CommandLineDialog::KeyValuePairCommandLineQuery::~KeyValuePairCommandLineQuery() {}
+
+bool CommandLineDialog::KeyValuePairCommandLineQuery::handle() {
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    try {
+      temp = CommandLineParser::getInstance().vm[getTitle()].as< KeyValuePair >();
+    } catch(boost::bad_any_cast &e) {
+      temp = KeyValuePair(std::string(""));
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+
Index: src/UIElements/CommandLineUI/Query/KeyValuePairsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/KeyValuePairsCommandLineQuery.cpp	(revision 33e80133683ce15eb991faac6abc6d540afee182)
+++ src/UIElements/CommandLineUI/Query/KeyValuePairsCommandLineQuery.cpp	(revision 33e80133683ce15eb991faac6abc6d540afee182)
@@ -0,0 +1,62 @@
+/*
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2015 Frederik Heber. All rights reserved.
+ * 
+ *
+ *   This file is part of MoleCuilder.
+ *
+ *    MoleCuilder is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    MoleCuilder is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with MoleCuilder.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * KeyValuePairsCommandLineQuery.cpp
+ *
+ *  Created on: May 16, 2015
+ *      Author: heber
+ */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "CodePatterns/MemDebug.hpp"
+
+#include "CommandLineUI/Query/CommandLineQuery.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
+#include "CodePatterns/Log.hpp"
+#include "CodePatterns/Verbose.hpp"
+
+#include "Parameters/Specifics/KeyValuePair.hpp"
+
+CommandLineDialog::KeyValuePairsCommandLineQuery::KeyValuePairsCommandLineQuery(Parameter<std::vector<KeyValuePair> > &_param, const std::string &_title, const std::string &_description) :
+    Dialog::TQuery<std::vector<KeyValuePair> >(_param, _title, _description)
+{}
+
+CommandLineDialog::KeyValuePairsCommandLineQuery::~KeyValuePairsCommandLineQuery() {}
+
+bool CommandLineDialog::KeyValuePairsCommandLineQuery::handle() {
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    try {
+      temp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<KeyValuePair> >();
+    } catch(boost::bad_any_cast &e) {
+      temp.clear();
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+
