From 1583777c598b0406d6d0da977591a1fb27c3c600 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 3 Oct 2018 13:18:26 +0200
Subject: [PATCH] continue removing std container wrappers

---
 .../src/rte/glushkov/GlushkovIndexate.cpp     |   8 +-
 .../automaton/transform/AutomataUnionTest.cpp |   2 -
 .../grammar/simplify/GrammarToCNFTest.cpp     |   2 -
 .../grammar/parsing/AbsorbTerminalSymbol.cpp  |   3 +-
 .../grammar/parsing/AbsorbTerminalSymbol.cpp  |   9 +-
 .../parsing/HandleFirstFollowConflict.cpp     |   7 +-
 alib2common/src/container/ObjectsMap.cpp      |  15 --
 alib2common/src/container/ObjectsMap.h        | 176 -----------------
 alib2common/src/container/ObjectsPair.cpp     |  15 --
 alib2common/src/container/ObjectsPair.h       | 177 ------------------
 alib2common/src/object/Object.cpp             |   6 +-
 alib2data/src/PrimitiveRegistrator.cpp        |   1 -
 alib2data/src/common/DefaultSymbolsPairType.h |  16 --
 .../arbology/CompressedBitParallelTreeIndex.h |   1 -
 .../NonlinearCompressedBitParallelTreeIndex.h |   1 -
 .../indexes/stringology/BitParallelIndex.h    |   3 +-
 .../src/indexes/stringology/BitSetIndex.h     |   2 -
 .../stringology/CompressedBitParallelIndex.h  |   3 +-
 alib2str/src/container/string/ObjectsPair.cpp |   8 +-
 alib2str/src/container/string/ObjectsPair.h   |  24 +--
 alib2str/src/object/string/AnyObject.cpp      |   1 -
 alib2xml/src/container/xml/ObjectsMap.cpp     |   6 +-
 alib2xml/src/container/xml/ObjectsMap.h       |  32 +---
 alib2xml/src/container/xml/ObjectsPair.cpp    |   6 +-
 alib2xml/src/container/xml/ObjectsPair.h      |  51 ++---
 alib2xml/test-src/object/AnyObjectTest.cpp    |   2 +-
 26 files changed, 57 insertions(+), 520 deletions(-)
 delete mode 100644 alib2common/src/container/ObjectsMap.cpp
 delete mode 100644 alib2common/src/container/ObjectsMap.h
 delete mode 100644 alib2common/src/container/ObjectsPair.cpp
 delete mode 100644 alib2common/src/container/ObjectsPair.h
 delete mode 100644 alib2data/src/common/DefaultSymbolsPairType.h

diff --git a/alib2algo/src/rte/glushkov/GlushkovIndexate.cpp b/alib2algo/src/rte/glushkov/GlushkovIndexate.cpp
index b66de2502a..c6131f5ec9 100644
--- a/alib2algo/src/rte/glushkov/GlushkovIndexate.cpp
+++ b/alib2algo/src/rte/glushkov/GlushkovIndexate.cpp
@@ -9,14 +9,12 @@
 
 #include <rte/formal/FormalRTEElements.h>
 
-#include <common/DefaultSymbolsPairType.h>
-
 namespace rte {
 
 // ----------------------------------------------------------------------------
 
 common::ranked_symbol < > GlushkovIndexate::getSymbolFromGlushkovPair ( const common::ranked_symbol < > & symbol ) {
-	const ext::pair < DefaultSymbolType, DefaultSymbolType > & sps = ( ( const DefaultSymbolsPairType & ) symbol.getSymbol ( ).getData ( ) );
+	const ext::pair < DefaultSymbolType, DefaultSymbolType > & sps = ( ( const object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > & ) symbol.getSymbol ( ).getData ( ) ).getData ( );
 	return common::ranked_symbol < > ( sps.first, symbol.getRank ( ) );
 }
 
@@ -29,13 +27,13 @@ FormalRTE < > GlushkovIndexate::index ( const rte::FormalRTE < > & rte ) {
 // ----------------------------------------------------------------------------
 
 ext::ptr_value < FormalRTEElement < DefaultSymbolType, primitive::Unsigned > > GlushkovIndexate::Formal::visit ( const rte::FormalRTESymbolAlphabet < DefaultSymbolType, primitive::Unsigned > & node, int & i ) {
-	DefaultSymbolsPairType sps = DefaultSymbolsPairType ( ext::make_pair ( DefaultSymbolType ( node.getSymbol ( ).getSymbol ( ) ), DefaultSymbolType ( i++ ) ) );
+	ext::pair < DefaultSymbolType, DefaultSymbolType > sps =  ext::make_pair ( DefaultSymbolType ( node.getSymbol ( ).getSymbol ( ) ), DefaultSymbolType ( i++ ) );
 	ext::ptr_vector < rte::FormalRTEElement < DefaultSymbolType, primitive::Unsigned > > children;
 	for ( const rte::FormalRTEElement < DefaultSymbolType, primitive::Unsigned > & e : node.getElements ( ) ) {
 		children.push_back ( ( FormalRTEElement < DefaultSymbolType, primitive::Unsigned > && ) e.accept < ext::ptr_value < rte::FormalRTEElement < DefaultSymbolType, primitive::Unsigned > >, GlushkovIndexate::Formal > ( i ) );
 	}
 
-	return ext::ptr_value < FormalRTESymbolAlphabet < DefaultSymbolType, primitive::Unsigned > > ( FormalRTESymbolAlphabet < DefaultSymbolType, primitive::Unsigned > ( common::ranked_symbol < > ( DefaultSymbolType ( sps ), node.getSymbol ( ).getRank ( ) ), std::move ( children ) ) );
+	return ext::ptr_value < FormalRTESymbolAlphabet < DefaultSymbolType, primitive::Unsigned > > ( FormalRTESymbolAlphabet < DefaultSymbolType, primitive::Unsigned > ( common::ranked_symbol < > ( DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( sps ) ), node.getSymbol ( ).getRank ( ) ), std::move ( children ) ) );
 }
 
 ext::ptr_value < FormalRTEElement < DefaultSymbolType, primitive::Unsigned > > GlushkovIndexate::Formal::visit ( const rte::FormalRTESymbolSubst < DefaultSymbolType, primitive::Unsigned > & node, int & ) {
diff --git a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
index 4f5b621004..ee38f8eab0 100644
--- a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
@@ -10,8 +10,6 @@
 #include "automaton/simplify/Total.h"
 #include "automaton/determinize/Determinize.h"
 
-#include <container/ObjectsPair.h>
-
 #include <exception/CommonException.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataUnionTest, "automaton" );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
index adb748a320..c66a594015 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
@@ -7,8 +7,6 @@
 
 #include <factory/StringDataFactory.hpp>
 
-#include <common/DefaultSymbolsPairType.h>
-
 #include <grammar/Grammar.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarToCNFTest, "grammar" );
diff --git a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
index 04df2c6ecf..81c80e675c 100644
--- a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
@@ -8,7 +8,6 @@
 #include "AbsorbTerminalSymbol.h"
 
 #include <grammar/ContextFree/CFG.h>
-#include <common/DefaultSymbolsPairType.h>
 #include <common/createUnique.hpp>
 
 namespace grammar {
@@ -50,7 +49,7 @@ void AbsorbTerminalSymbol::absorbTerminalSymbol ( grammar::CFG < > & grammar, co
 	ext::map < DefaultSymbolType, DefaultSymbolType > nonterminalsPrimed; // terminal is fixed in particular calls
 
 	for ( const DefaultSymbolType & nonterminal : nonterminals ) {
-		DefaultSymbolType newSymbol = common::createUnique ( DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( nonterminal, terminal ) ) ), res.getTerminalAlphabet ( ), res.getNonterminalAlphabet ( ) );
+		DefaultSymbolType newSymbol = common::createUnique ( DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( nonterminal, terminal ) ) ), res.getTerminalAlphabet ( ), res.getNonterminalAlphabet ( ) );
 		res.addNonterminalSymbol ( newSymbol );
 		nonterminalsPrimed.insert ( std::make_pair ( nonterminal, newSymbol ) );
 	}
diff --git a/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp b/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp
index bfa82da272..0fbf3d2f3d 100644
--- a/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp
+++ b/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp
@@ -1,7 +1,6 @@
 #include "AbsorbTerminalSymbol.h"
 
 #include "grammar/ContextFree/CFG.h"
-#include <common/DefaultSymbolsPairType.h>
 #include "grammar/parsing/AbsorbTerminalSymbol.h"
 #include "factory/StringDataFactory.hpp"
 
@@ -23,7 +22,7 @@ void AbsorbTerminalSymbol::testAbsorbTerminalSymbol ( ) {
 	DefaultSymbolType b = DefaultSymbolType ( 'b' );
 	DefaultSymbolType c = DefaultSymbolType ( 'c' );
 
-	DefaultSymbolType Ba = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( B, a ) ) );
+	DefaultSymbolType Ba = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( B, a ) ) );
 
 	grammar::CFG < > grammar ( A );
 
@@ -69,8 +68,8 @@ void AbsorbTerminalSymbol::testAbsorbTerminalSymbol2 ( ) {
 	DefaultSymbolType b = DefaultSymbolType ( 'b' );
 	DefaultSymbolType c = DefaultSymbolType ( 'c' );
 
-	DefaultSymbolType Ba = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( B, a ) ) );
-	DefaultSymbolType Xa = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( X, a ) ) );
+	DefaultSymbolType Ba = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( B, a ) ) );
+	DefaultSymbolType Xa = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( X, a ) ) );
 
 	grammar::CFG < > grammar ( A );
 
@@ -118,7 +117,7 @@ void AbsorbTerminalSymbol::testAbsorbTerminalSymbol3 ( ) {
 	DefaultSymbolType b = DefaultSymbolType ( 'b' );
 	DefaultSymbolType c = DefaultSymbolType ( 'c' );
 
-	DefaultSymbolType Ba = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( B, a ) ) );
+	DefaultSymbolType Ba = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( B, a ) ) );
 
 	grammar::CFG < > grammar ( A );
 
diff --git a/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp
index 17ff67d5fc..4b7f4c9fc0 100644
--- a/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp
+++ b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp
@@ -1,7 +1,6 @@
 #include "HandleFirstFollowConflict.h"
 
 #include "grammar/ContextFree/CFG.h"
-#include "common/DefaultSymbolsPairType.h"
 #include "grammar/parsing/HandleFirstFollowConflict.h"
 #include "factory/StringDataFactory.hpp"
 
@@ -24,7 +23,7 @@ void HandleFirstFollowConflict::testHandleFirstFollowConflict ( ) {
 	DefaultSymbolType c = DefaultSymbolType ( 'c' );
 	DefaultSymbolType d = DefaultSymbolType ( 'd' );
 
-	DefaultSymbolType Ba = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( B, a ) ) );
+	DefaultSymbolType Ba = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( B, a ) ) );
 
 	grammar::CFG < > grammar ( A );
 
@@ -94,8 +93,8 @@ void HandleFirstFollowConflict::testHandleFirstFollowConflict2 ( ) {
 	DefaultSymbolType c = DefaultSymbolType ( 'c' );
 	DefaultSymbolType d = DefaultSymbolType ( 'd' );
 
-	DefaultSymbolType Ba = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( B, a ) ) );
-	DefaultSymbolType Xa = DefaultSymbolType ( DefaultSymbolsPairType ( ext::make_pair ( X, a ) ) );
+	DefaultSymbolType Ba = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( B, a ) ) );
+	DefaultSymbolType Xa = DefaultSymbolType ( object::AnyObject < ext::pair < DefaultSymbolType, DefaultSymbolType > > ( ext::make_pair ( X, a ) ) );
 
 	grammar::CFG < > grammar ( A );
 
diff --git a/alib2common/src/container/ObjectsMap.cpp b/alib2common/src/container/ObjectsMap.cpp
deleted file mode 100644
index 2473efec59..0000000000
--- a/alib2common/src/container/ObjectsMap.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Map.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsMap.h"
-#include <registration/ValuePrinterRegistration.hpp>
-
-namespace {
-
-static auto valuePrinter = registration::ValuePrinterRegister < container::ObjectsMap < > > ( );
-
-} /* namespace */
diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h
deleted file mode 100644
index 944c624a04..0000000000
--- a/alib2common/src/container/ObjectsMap.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Map.h
- *
- * This file is part of Algorithms library toolkit.
- * Copyright (C) 2017 Jan Travnicek (jan.travnicek@fit.cvut.cz)
-
- * Algorithms library toolkit 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 3 of the License, or
- * (at your option) any later version.
-
- * Algorithms library toolkit 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 Algorithms library toolkit.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#ifndef OBJECTS_MAP_H_
-#define OBJECTS_MAP_H_
-
-#include <alib/map>
-#include <alib/string>
-#include <sstream>
-
-#include "ContainerBase.h"
-
-#include <object/UniqueObject.h>
-#include <object/ObjectFactory.h>
-
-#include <core/normalize.hpp>
-#include <container/ObjectsPair.h>
-
-namespace container {
-
-/**
- * \brief
- * Represents an adaptor of a map container from the stl extensions provided by the algorithms library.
- *
- * The map is an associative container.
- *
- * \tparam KeyType the type of keys in the map.
- * \tparam ValueType the type of values in the map.
- */
-template < class KeyType = object::Object, class ValueType = object::Object >
-class ObjectsMap final : public ext::map < KeyType, ValueType >, public ContainerBase {
-public:
-	/**
-	 * \brief
-	 * Creates a new instance of the container based on the extended version of the stl map container.
-	 *
-	 * \param raw the extended map container
-	 */
-	explicit ObjectsMap ( ext::map < KeyType, ValueType > raw );
-
-	/**
-	 * \brief
-	 * Creates a new instance of the contaier based on defaultly construted underlying container.
-	 */
-	explicit ObjectsMap ( );
-
-	/**
-	 * @copydoc alphabet::ContainerBase::clone ( ) const &
-	 */
-	virtual ContainerBase * clone ( ) const & override;
-
-	/**
-	 * @copydoc alphabet::ContainerBase::clone ( ) &&
-	 */
-	virtual ContainerBase * clone ( ) && override;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const
-	 */
-	virtual int compare ( const ObjectBase & other ) const override {
-		if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
-		return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
-	}
-
-	/**
-	 * The actual compare method
-	 *
-	 * \param other the other instance
-	 *
-	 * \returns the actual relation between two by type same containers
-	 */
-	int compare ( const ObjectsMap & other ) const;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const
-	 */
-	virtual void operator >>( std::ostream & os ) const override;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const
-	 */
-	virtual explicit operator std::string ( ) const override;
-
-	/**
-	 * @copydoc object::ObjectBase::inc ( ) &&
-	 */
-	virtual object::ObjectBase * inc ( ) && override;
-};
-
-template < class KeyType, class ValueType >
-ObjectsMap<KeyType, ValueType>::ObjectsMap ( ext::map < KeyType, ValueType > raw ) : ext::map < KeyType, ValueType > ( std::move ( raw ) ) {
-
-}
-
-template < class KeyType, class ValueType >
-ObjectsMap<KeyType, ValueType>::ObjectsMap() : ext::map<KeyType, ValueType>() {
-
-}
-
-template < class KeyType, class ValueType >
-ContainerBase* ObjectsMap<KeyType, ValueType>::clone ( ) const & {
-	return new ObjectsMap(*this);
-}
-
-template < class KeyType, class ValueType >
-ContainerBase* ObjectsMap<KeyType, ValueType>::clone() && {
-	return new ObjectsMap(std::move(*this));
-}
-
-template < class KeyType, class ValueType >
-int ObjectsMap<KeyType, ValueType>::compare(const ObjectsMap& other) const {
-	static ext::compare<ext::map<KeyType, ValueType>> comp;
-	return comp ( static_cast < const ext::map < KeyType, ValueType > & > ( * this ), static_cast < const ext::map < KeyType, ValueType > & > ( other ) );
-}
-
-template < class KeyType, class ValueType >
-void ObjectsMap<KeyType, ValueType>::operator>>(std::ostream& os) const {
-	os << "(ObjectsMap " << static_cast < const ext::map < KeyType, ValueType > & > ( * this ) << ")";
-}
-
-template < class KeyType, class ValueType >
-ObjectsMap<KeyType, ValueType>::operator std::string() const {
-	std::stringstream ss;
-	ss << *this;
-	return std::move(ss).str();
-}
-
-template < class KeyType, class ValueType >
-object::ObjectBase* ObjectsMap < KeyType, ValueType >::inc() && {
-	return new object::UniqueObject(object::Object(std::move(*this)), primitive::Integer(0));
-}
-
-} /* namespace container */
-
-namespace core {
-
-template < class KeyType, class ValueType >
-struct normalize < container::ObjectsMap < KeyType, ValueType > > {
-	static ext::map < object::Object, object::Object > raw ( ext::map < KeyType, ValueType > && source ) {
-		ext::map < object::Object, object::Object > res;
-
-		for ( std::pair < KeyType, ValueType > && element : ext::make_mover ( source ) )
-			res.insert ( normalize < container::ObjectsPair < KeyType, ValueType > >::raw2 ( std::move ( element ) ) );
-
-		return res;
-	}
-
-	static container::ObjectsMap < > eval ( container::ObjectsMap < KeyType, ValueType > && value ) {
-		return container::ObjectsMap < > ( raw ( std::move ( value ) ) );
-	}
-};
-
-} /* namespace core */
-
-#endif /* OBJECTS_MAP_H_ */
diff --git a/alib2common/src/container/ObjectsPair.cpp b/alib2common/src/container/ObjectsPair.cpp
deleted file mode 100644
index 84cc357b1c..0000000000
--- a/alib2common/src/container/ObjectsPair.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Pair.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsPair.h"
-#include <registration/ValuePrinterRegistration.hpp>
-
-namespace {
-
-static auto valuePrinter = registration::ValuePrinterRegister < container::ObjectsPair < > > ( );
-
-} /* namespace */
diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h
deleted file mode 100644
index 4f8683175d..0000000000
--- a/alib2common/src/container/ObjectsPair.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Pair.h
- *
- * This file is part of Algorithms library toolkit.
- * Copyright (C) 2017 Jan Travnicek (jan.travnicek@fit.cvut.cz)
-
- * Algorithms library toolkit 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 3 of the License, or
- * (at your option) any later version.
-
- * Algorithms library toolkit 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 Algorithms library toolkit.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#ifndef OBJECTS_PAIR_H_
-#define OBJECTS_PAIR_H_
-
-#include <alib/pair>
-#include <alib/string>
-#include <sstream>
-
-#include "ContainerBase.h"
-
-#include <object/UniqueObject.h>
-#include <object/ObjectFactory.h>
-
-#include <core/normalize.hpp>
-
-namespace container {
-
-/**
- * \brief
- * Represents an adaptor of a pair datatype from the stl extensions provided by the algorithms library.
- *
- * The datatype packs two arbitrary values together.
- *
- * \tparam FirstType the type of the first object in the pair.
- * \tparam SecondType the type of the second object in the pair.
- */
-template < class FirstType = object::Object, class SecondType = object::Object >
-class ObjectsPair final : public ext::pair < FirstType, SecondType >, public ContainerBase {
-public:
-	/**
-	 * \brief
-	 * Creates a new instance of the pair based on the two packed values.
-	 *
-	 * \param firstObject the first value of the pair
-	 * \param firstObject the second value of the pair
-	 */
-	explicit ObjectsPair ( FirstType firstObject, SecondType secondObject );
-
-	/**
-	 * \brief
-	 * Creates a new instance of the pair based on the extended version of the stl pair.
-	 *
-	 * \param raw the extended pair datatype
-	 */
-	explicit ObjectsPair ( ext::pair < FirstType, SecondType > raw );
-
-	/**
-	 * @copydoc alphabet::ContainerBase::clone ( ) const &
-	 */
-	virtual ContainerBase * clone ( ) const & override;
-
-	/**
-	 * @copydoc alphabet::ContainerBase::clone ( ) &&
-	 */
-	virtual ContainerBase * clone ( ) && override;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const
-	 */
-	virtual int compare ( const ObjectBase & other ) const override {
-		if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
-
-		return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) );
-	}
-
-	/**
-	 * The actual compare method
-	 *
-	 * \param other the other instance
-	 *
-	 * \returns the actual relation between two by type same containers
-	 */
-	int compare ( const ObjectsPair & other ) const;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const
-	 */
-	virtual void operator >>( std::ostream & os ) const override;
-
-	/**
-	 * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const
-	 */
-	virtual explicit operator std::string ( ) const override;
-
-	/**
-	 * @copydoc object::ObjectBase::inc ( ) &&
-	 */
-	virtual object::ObjectBase * inc ( ) && override;
-};
-
-template < class FirstType, class SecondType >
-ObjectsPair < FirstType, SecondType >::ObjectsPair(ext::pair<FirstType, SecondType> raw) : ext::pair<FirstType, SecondType>(std::move(raw)) {
-
-}
-
-template < class FirstType, class SecondType >
-ObjectsPair < FirstType, SecondType >::ObjectsPair(FirstType firstObject, SecondType secondObject) : ext::pair<FirstType, SecondType>(std::move(firstObject), std::move(secondObject)) {
-
-}
-
-template < class FirstType, class SecondType >
-ContainerBase* ObjectsPair < FirstType, SecondType >::clone ( ) const & {
-	return new ObjectsPair(*this);
-}
-
-template < class FirstType, class SecondType >
-ContainerBase* ObjectsPair < FirstType, SecondType >::clone() && {
-	return new ObjectsPair(std::move(*this));
-}
-
-template < class FirstType, class SecondType >
-int ObjectsPair < FirstType, SecondType >::compare(const ObjectsPair& other) const {
-	static ext::compare<ext::pair<FirstType, SecondType>> comp;
-	return comp ( static_cast < const ext::pair < FirstType, SecondType > & > ( * this ), static_cast < const ext::pair < FirstType, SecondType > & > ( other ) );
-}
-
-template < class FirstType, class SecondType >
-void ObjectsPair < FirstType, SecondType >::operator>>(std::ostream& os) const {
-	os << "(ObjectsPair " << static_cast < const ext::pair < FirstType, SecondType > & > ( * this ) << ")";
-}
-
-template < class FirstType, class SecondType >
-ObjectsPair < FirstType, SecondType >::operator std::string() const {
-	std::stringstream ss;
-	ss << *this;
-	return std::move(ss).str();
-}
-
-template < class FirstType, class SecondType >
-object::ObjectBase* ObjectsPair < FirstType, SecondType >::inc() && {
-	return new object::UniqueObject(object::Object(std::move(*this)), primitive::Integer(0));
-}
-
-} /* namespace container */
-
-namespace core {
-
-template < class FirstType, class SecondType >
-struct normalize < container::ObjectsPair < FirstType, SecondType > > {
-	static std::pair < object::Object, object::Object > raw2 ( std::pair < FirstType, SecondType > && source ) {
-		return std::make_pair ( object::ObjectFactory::make ( std::move ( source.first ) ), object::ObjectFactory::make ( std::move ( source.second ) ) );
-	}
-
-	static ext::pair < object::Object, object::Object > raw ( ext::pair < FirstType, SecondType > && source ) {
-		return ext::make_pair ( object::ObjectFactory::make ( std::move ( source.first ) ), object::ObjectFactory::make ( std::move ( source.second ) ) );
-	}
-
-	static container::ObjectsPair < > eval ( container::ObjectsPair < FirstType, SecondType > && value ) {
-		return container::ObjectsPair < > ( raw ( std::move ( value ) ) );
-	}
-};
-
-} /* namespace core */
-
-#endif /* OBJECTS_PAIR_H_ */
diff --git a/alib2common/src/object/Object.cpp b/alib2common/src/object/Object.cpp
index 51b2129d7e..fc59d85f39 100644
--- a/alib2common/src/object/Object.cpp
+++ b/alib2common/src/object/Object.cpp
@@ -5,11 +5,13 @@
  *      Author: Jan Travnicek
  */
 
+#include <alib/pair>
+
 #include "Object.h"
 #include <primitive/Integer.h>
 #include <primitive/Character.h>
 #include <primitive/String.h>
-#include <container/ObjectsPair.h>
+#include <object/AnyObject.h>
 
 namespace object {
 
@@ -23,7 +25,7 @@ Object::Object ( int number ) : Object ( primitive::Integer ( number ) ) {
 Object::Object ( int number1, int number2 ) : Object ( Object ( number1 ), Object ( number2 ) ) {
 }
 
-Object::Object ( Object object1, Object object2 ) : Object ( container::ObjectsPair < Object, Object > { ext::make_pair ( std::move ( object1 ), std::move ( object2 ) ) } ) {
+Object::Object ( Object object1, Object object2 ) : Object ( object::AnyObject < ext::pair < Object, Object > > { ext::make_pair ( std::move ( object1 ), std::move ( object2 ) ) } ) {
 }
 
 Object::Object ( char character ) : Object ( primitive::Character ( character ) ) {
diff --git a/alib2data/src/PrimitiveRegistrator.cpp b/alib2data/src/PrimitiveRegistrator.cpp
index fbee66c523..4f00beea62 100644
--- a/alib2data/src/PrimitiveRegistrator.cpp
+++ b/alib2data/src/PrimitiveRegistrator.cpp
@@ -76,7 +76,6 @@ public:
 		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < unsigned int > > ( );
 		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < common::ranked_symbol < object::Object, primitive::Unsigned > > > ( );
 		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::pair < unsigned int, unsigned int > > > ( );
-		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::pair < object::Object, object::Object > > > ( );
 		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::pair < object::Object, unsigned int > > > ( );
 		core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::set < char > > > ( );
 
diff --git a/alib2data/src/common/DefaultSymbolsPairType.h b/alib2data/src/common/DefaultSymbolsPairType.h
deleted file mode 100644
index 9abcb7205d..0000000000
--- a/alib2data/src/common/DefaultSymbolsPairType.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * DefaultSymbolsPairSymbol.h
- *
- *  Created on: Dec 10, 2016
- *      Author: Jan Travnicek
- */
-
-#ifndef DEFAULT_SYMBOLS_PAIR_SYMBOL_H_
-#define DEFAULT_SYMBOLS_PAIR_SYMBOL_H_
-
-#include <container/ObjectsPair.h>
-#include <common/DefaultSymbolType.h>
-
-typedef container::ObjectsPair < DefaultSymbolType, DefaultSymbolType > DefaultSymbolsPairType;
-
-#endif /* DEFAULT_SYMBOLS_PAIR_SYMBOL_H_ */
diff --git a/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h b/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h
index 410bf12015..b20d61b5a6 100644
--- a/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h
+++ b/alib2data/src/indexes/arbology/CompressedBitParallelTreeIndex.h
@@ -38,7 +38,6 @@
 #include <object/UniqueObject.h>
 #include <object/ObjectBase.h>
 
-#include <container/ObjectsMap.h>
 #include <common/SparseBoolVector.hpp>
 
 #include <primitive/Bool.h>
diff --git a/alib2data/src/indexes/arbology/NonlinearCompressedBitParallelTreeIndex.h b/alib2data/src/indexes/arbology/NonlinearCompressedBitParallelTreeIndex.h
index 782cffbe39..a166aeb1d1 100644
--- a/alib2data/src/indexes/arbology/NonlinearCompressedBitParallelTreeIndex.h
+++ b/alib2data/src/indexes/arbology/NonlinearCompressedBitParallelTreeIndex.h
@@ -37,7 +37,6 @@
 #include <object/UniqueObject.h>
 #include <object/ObjectBase.h>
 
-#include <container/ObjectsMap.h>
 #include <common/SparseBoolVector.hpp>
 #include <primitive/Bool.h>
 
diff --git a/alib2data/src/indexes/stringology/BitParallelIndex.h b/alib2data/src/indexes/stringology/BitParallelIndex.h
index 590d069380..b9e4b5ce2c 100644
--- a/alib2data/src/indexes/stringology/BitParallelIndex.h
+++ b/alib2data/src/indexes/stringology/BitParallelIndex.h
@@ -37,10 +37,9 @@
 #include <object/UniqueObject.h>
 #include <object/ObjectBase.h>
 
-#include <container/ObjectsMap.h>
-
 #include <primitive/Bool.h>
 
+#include <core/normalize.hpp>
 #include <alphabet/common/SymbolNormalize.h>
 
 namespace indexes {
diff --git a/alib2data/src/indexes/stringology/BitSetIndex.h b/alib2data/src/indexes/stringology/BitSetIndex.h
index cb8a52f2d8..1bd3f11772 100644
--- a/alib2data/src/indexes/stringology/BitSetIndex.h
+++ b/alib2data/src/indexes/stringology/BitSetIndex.h
@@ -37,8 +37,6 @@
 #include <object/UniqueObject.h>
 #include <object/ObjectBase.h>
 
-#include <container/ObjectsMap.h>
-
 #include <primitive/Bool.h>
 #include <alib/bitset>
 
diff --git a/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h b/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h
index d446c97e0f..2fd96bbfc1 100644
--- a/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h
+++ b/alib2data/src/indexes/stringology/CompressedBitParallelIndex.h
@@ -37,12 +37,11 @@
 #include <object/UniqueObject.h>
 #include <object/ObjectBase.h>
 
-#include <container/ObjectsMap.h>
-
 #include <common/SparseBoolVector.hpp>
 
 #include <primitive/Bool.h>
 
+#include <core/normalize.hpp>
 #include <alphabet/common/SymbolNormalize.h>
 
 namespace indexes {
diff --git a/alib2str/src/container/string/ObjectsPair.cpp b/alib2str/src/container/string/ObjectsPair.cpp
index dacdafdff4..630d7a4f7f 100644
--- a/alib2str/src/container/string/ObjectsPair.cpp
+++ b/alib2str/src/container/string/ObjectsPair.cpp
@@ -11,10 +11,10 @@
 
 namespace {
 
-static auto stringWrite = registration::StringWriterRegister < container::ObjectsPair < > > ( );
-static auto stringReader = registration::StringReaderRegister < object::Object, container::ObjectsPair < > > ( );
+static auto stringWrite = registration::StringWriterRegister < ext::pair < object::Object, object::Object > > ( );
+static auto stringReader = registration::StringReaderRegister < object::Object, ext::pair < object::Object, object::Object > > ( );
 
-static auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, container::ObjectsPair < > > ( );
-static auto stringReaderGroup = registration::StringReaderRegisterTypeInGroup < object::Object, container::ObjectsPair < > > ( );
+static auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
+static auto stringReaderGroup = registration::StringReaderRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
 
 } /* namespace */
diff --git a/alib2str/src/container/string/ObjectsPair.h b/alib2str/src/container/string/ObjectsPair.h
index c20cb5f785..b8c1ac8d99 100644
--- a/alib2str/src/container/string/ObjectsPair.h
+++ b/alib2str/src/container/string/ObjectsPair.h
@@ -8,7 +8,7 @@
 #ifndef _STRING_OBJECTS_PAIR_H_
 #define _STRING_OBJECTS_PAIR_H_
 
-#include <container/ObjectsPair.h>
+#include <alib/pair>
 #include <core/stringApi.hpp>
 
 #include <container/ContainerFromStringLexer.h>
@@ -87,28 +87,6 @@ void stringApi < ext::pair < FirstType, SecondType > >::compose ( std::ostream &
 	stringApi < std::pair < FirstType, SecondType > >::compose ( output, container );
 }
 
-template<class FirstType, class SecondType >
-struct stringApi < container::ObjectsPair < FirstType, SecondType > > {
-	static container::ObjectsPair < FirstType, SecondType > parse ( std::istream & input );
-	static bool first ( std::istream & input );
-	static void compose ( std::ostream & output, const container::ObjectsPair < FirstType, SecondType > & container );
-};
-
-template<class FirstType, class SecondType >
-container::ObjectsPair < FirstType, SecondType > stringApi < container::ObjectsPair < FirstType, SecondType > >::parse ( std::istream & input ) {
-	return container::ObjectsPair < FirstType, SecondType > ( stringApi < ext::pair < FirstType, SecondType > >::parse ( input ) );
-}
-
-template<class FirstType, class SecondType >
-bool stringApi < container::ObjectsPair < FirstType, SecondType > >::first ( std::istream & input ) {
-	return stringApi < ext::pair < FirstType, SecondType > >::first ( input );
-}
-
-template<class FirstType, class SecondType >
-void stringApi < container::ObjectsPair < FirstType, SecondType > >::compose ( std::ostream & output, const container::ObjectsPair < FirstType, SecondType > & container ) {
-	stringApi < ext::pair < FirstType, SecondType > >::compose ( output, container );
-}
-
 } /* namespace core */
 
 #endif /* _STRING_OBJECTS_PAIR_H_ */
diff --git a/alib2str/src/object/string/AnyObject.cpp b/alib2str/src/object/string/AnyObject.cpp
index e631229bb4..7b3a50f435 100644
--- a/alib2str/src/object/string/AnyObject.cpp
+++ b/alib2str/src/object/string/AnyObject.cpp
@@ -15,7 +15,6 @@
 
 namespace {
 
-static auto stringWriteGroup2 = registration::StringWriterRegisterTypeInGroup < object::Object, object::AnyObject < ext::pair < object::Object, object::Object > > > ( );
 static auto stringWriteGroup3 = registration::StringWriterRegisterTypeInGroup < object::Object, object::AnyObject < unsigned > > ( );
 static auto stringWriteGroup4 = registration::StringWriterRegisterTypeInGroup < object::Object, object::AnyObject < ext::pair < unsigned, unsigned > > > ( );
 
diff --git a/alib2xml/src/container/xml/ObjectsMap.cpp b/alib2xml/src/container/xml/ObjectsMap.cpp
index 653fac7a0f..5212b2efdc 100644
--- a/alib2xml/src/container/xml/ObjectsMap.cpp
+++ b/alib2xml/src/container/xml/ObjectsMap.cpp
@@ -11,9 +11,9 @@
 
 namespace {
 
-static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsMap < > > ( );
-static auto xmlRead = registration::XmlReaderRegister < container::ObjectsMap < > > ( );
+static auto xmlWrite = registration::XmlWriterRegister < ext::map < object::Object, object::Object > > ( );
+static auto xmlRead = registration::XmlReaderRegister < ext::map < object::Object, object::Object > > ( );
 
-static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsMap < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::map < object::Object, object::Object > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMap.h b/alib2xml/src/container/xml/ObjectsMap.h
index 4995757a0d..89c4bde7fb 100644
--- a/alib2xml/src/container/xml/ObjectsMap.h
+++ b/alib2xml/src/container/xml/ObjectsMap.h
@@ -8,7 +8,7 @@
 #ifndef _XML_OBJECTS_MAP_H_
 #define _XML_OBJECTS_MAP_H_
 
-#include <container/ObjectsMap.h>
+#include <alib/map>
 #include <core/xmlApi.hpp>
 #include <container/xml/ObjectsPair.h>
 
@@ -52,39 +52,11 @@ void xmlApi < ext::map < T, R > >::compose ( ext::deque < sax::Token > & output,
 	output.emplace_back ( xmlTagName ( ), sax::Token::TokenType::START_ELEMENT );
 
 	for ( const std::pair < const T, R > & item : input )
-		core::xmlApi < ext::pair < const T, R > >::compose ( output, item );
+		core::xmlApi < std::pair < const T, R > >::compose ( output, item );
 
 	output.emplace_back ( xmlTagName ( ), sax::Token::TokenType::END_ELEMENT );
 }
 
-template < typename T, typename R >
-struct xmlApi < container::ObjectsMap < T, R > > {
-	static container::ObjectsMap < T, R > parse ( ext::deque < sax::Token >::iterator & input );
-	static bool first ( const ext::deque < sax::Token >::const_iterator & input );
-	static const std::string & xmlTagName ( );
-	static void compose ( ext::deque < sax::Token > & output, const container::ObjectsMap < T, R > & data );
-};
-
-template < typename T, typename R >
-container::ObjectsMap < T, R > xmlApi < container::ObjectsMap < T, R > >::parse ( ext::deque < sax::Token >::iterator & input ) {
-	return container::ObjectsMap < T, R > ( xmlApi < ext::map < T, R > >::parse ( input ) );
-}
-
-template < typename T, typename R >
-bool xmlApi < container::ObjectsMap < T, R > >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
-	return sax::FromXMLParserHelper::isToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
-}
-
-template < typename T, typename R >
-const std::string & xmlApi < container::ObjectsMap < T, R > >::xmlTagName ( ) {
-	return xmlApi < ext::map < T, R > >::xmlTagName ( );
-}
-
-template < typename T, typename R >
-void xmlApi < container::ObjectsMap < T, R > >::compose ( ext::deque < sax::Token > & output, const container::ObjectsMap < T, R > & input ) {
-	xmlApi < ext::map < T, R > >::compose ( output, input );
-}
-
 } /* namespace core */
 
 #endif /* _XML_OBJECTS_MAP_H_ */
diff --git a/alib2xml/src/container/xml/ObjectsPair.cpp b/alib2xml/src/container/xml/ObjectsPair.cpp
index d179f2f8cb..302c955d48 100644
--- a/alib2xml/src/container/xml/ObjectsPair.cpp
+++ b/alib2xml/src/container/xml/ObjectsPair.cpp
@@ -11,9 +11,9 @@
 
 namespace {
 
-static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsPair < > > ( );
-static auto xmlRead = registration::XmlReaderRegister < container::ObjectsPair < > > ( );
+static auto xmlWrite = registration::XmlWriterRegister < ext::pair < object::Object, object::Object > > ( );
+static auto xmlRead = registration::XmlReaderRegister < ext::pair < object::Object, object::Object > > ( );
 
-static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsPair < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsPair.h b/alib2xml/src/container/xml/ObjectsPair.h
index e7914cb9c1..e6a6589cf9 100644
--- a/alib2xml/src/container/xml/ObjectsPair.h
+++ b/alib2xml/src/container/xml/ObjectsPair.h
@@ -8,22 +8,21 @@
 #ifndef _XML_OBJECTS_PAIR_H_
 #define _XML_OBJECTS_PAIR_H_
 
-#include <container/ObjectsPair.h>
+#include <alib/pair>
 #include <core/xmlApi.hpp>
 
 namespace core {
 
 template < typename T, typename R >
-struct xmlApi < ext::pair < T, R > > {
-	static ext::pair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
+struct xmlApi < std::pair < T, R > > {
+	static std::pair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
 	static bool first ( const ext::deque < sax::Token >::const_iterator & input );
 	static const std::string & xmlTagName ( );
-	static void compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & data );
 	static void compose ( ext::deque < sax::Token > & output, const std::pair < T, R > & data );
 };
 
 template < typename T, typename R >
-ext::pair < T, R > xmlApi < ext::pair < T, R > >::parse ( ext::deque < sax::Token >::iterator & input ) {
+std::pair < T, R > xmlApi < std::pair < T, R > >::parse ( ext::deque < sax::Token >::iterator & input ) {
 	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
 
 	T first = core::xmlApi < T >::parse ( input );
@@ -31,28 +30,23 @@ ext::pair < T, R > xmlApi < ext::pair < T, R > >::parse ( ext::deque < sax::Toke
 
 	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, xmlTagName ( ) );
 
-	return ext::make_pair ( std::move ( first ), std::move ( second ) );
+	return std::make_pair ( std::move ( first ), std::move ( second ) );
 }
 
 template < typename T, typename R >
-bool xmlApi < ext::pair < T, R > >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
+bool xmlApi < std::pair < T, R > >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
 	return sax::FromXMLParserHelper::isToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
 }
 
 template < typename T, typename R >
-const std::string & xmlApi < ext::pair < T, R > >::xmlTagName ( ) {
+const std::string & xmlApi < std::pair < T, R > >::xmlTagName ( ) {
 	static std::string xmlTagName = "Pair";
 
 	return xmlTagName;
 }
 
 template < typename T, typename R >
-void xmlApi < ext::pair < T, R > >::compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & input ) {
-	compose ( output, static_cast < const std::pair < T, R > > ( input ) );
-}
-
-template < typename T, typename R >
-void xmlApi < ext::pair < T, R > >::compose ( ext::deque < sax::Token > & output, const std::pair < T, R > & input ) {
+void xmlApi < std::pair < T, R > >::compose ( ext::deque < sax::Token > & output, const std::pair < T, R > & input ) {
 	output.emplace_back ( xmlTagName ( ), sax::Token::TokenType::START_ELEMENT );
 
 	core::xmlApi < typename std::decay < T >::type >::compose ( output, input.first );
@@ -62,31 +56,38 @@ void xmlApi < ext::pair < T, R > >::compose ( ext::deque < sax::Token > & output
 }
 
 template < typename T, typename R >
-struct xmlApi < container::ObjectsPair < T, R > > {
-	static container::ObjectsPair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
+struct xmlApi < ext::pair < T, R > > {
+	static ext::pair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
 	static bool first ( const ext::deque < sax::Token >::const_iterator & input );
 	static const std::string & xmlTagName ( );
-	static void compose ( ext::deque < sax::Token > & output, const container::ObjectsPair < T, R > & data );
+	static void compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & data );
 };
 
 template < typename T, typename R >
-container::ObjectsPair < T, R > xmlApi < container::ObjectsPair < T, R > >::parse ( ext::deque < sax::Token >::iterator & input ) {
-	return container::ObjectsPair < T, R > ( xmlApi < ext::pair < T, R > >::parse ( input ) );
+ext::pair < T, R > xmlApi < ext::pair < T, R > >::parse ( ext::deque < sax::Token >::iterator & input ) {
+	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
+
+	T first = core::xmlApi < T >::parse ( input );
+	R second = core::xmlApi < R >::parse ( input );
+
+	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, xmlTagName ( ) );
+
+	return ext::make_pair ( std::move ( first ), std::move ( second ) );
 }
 
 template < typename T, typename R >
-bool xmlApi < container::ObjectsPair < T, R > >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
-	return xmlApi < ext::pair < T, R > >::first ( input );
+bool xmlApi < ext::pair < T, R > >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
+	return xmlApi < std::pair < T, R > >::first ( input );
 }
 
 template < typename T, typename R >
-const std::string & xmlApi < container::ObjectsPair < T, R > >::xmlTagName ( ) {
-	return xmlApi < ext::pair < T, R > >::xmlTagName ( );
+const std::string & xmlApi < ext::pair < T, R > >::xmlTagName ( ) {
+	return xmlApi < std::pair < T, R > >::xmlTagName ( );
 }
 
 template < typename T, typename R >
-void xmlApi < container::ObjectsPair < T, R > >::compose ( ext::deque < sax::Token > & output, const container::ObjectsPair < T, R > & input ) {
-	xmlApi < ext::pair < T, R > >::compose ( output, input );
+void xmlApi < ext::pair < T, R > >::compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & input ) {
+	xmlApi < std::pair < T, R > >::compose ( output, input );
 }
 
 } /* namespace core */
diff --git a/alib2xml/test-src/object/AnyObjectTest.cpp b/alib2xml/test-src/object/AnyObjectTest.cpp
index 4fc523e22b..1d6c1ab155 100644
--- a/alib2xml/test-src/object/AnyObjectTest.cpp
+++ b/alib2xml/test-src/object/AnyObjectTest.cpp
@@ -20,7 +20,7 @@ void AnyObjectTest::tearDown ( ) {
 void AnyObjectTest::testXMLParser ( ) {
 
 	object::AnyObject < ext::pair < int, char > > object ( ext::make_pair ( 1, 'a' ) );
-	object::Object res ( container::ObjectsPair < object::Object, object::Object > ( object::Object ( primitive::Integer ( 1 ) ), object::Object ( primitive::Character ( 'a' ) ) ) );
+	object::Object res ( object::AnyObject < ext::pair < object::Object, object::Object > > ( ext::make_pair ( object::Object ( primitive::Integer ( 1 ) ), object::Object ( primitive::Character ( 'a' ) ) ) ) );
 
 	{
 		std::string tmp = factory::XmlDataFactory::toString ( object );
-- 
GitLab