diff --git a/alib2data/src/automaton/TA/DFTA.h b/alib2data/src/automaton/TA/DFTA.h
index 6c96b2dc084e87963bb3d9b5aeb85c1c16912b7a..5953efb7a0999d5af818af9d889e370c3a2942d2 100644
--- a/alib2data/src/automaton/TA/DFTA.h
+++ b/alib2data/src/automaton/TA/DFTA.h
@@ -105,7 +105,7 @@ public:
 	 * @param next next state
 	 * @throws AutomatonException when transition already exists or when transition contains state or symbol not present in the automaton
 	 */
-	bool addTransition ( const std::ranked_symbol < SymbolType, RankType > & current, const std::vector < StateType > & children, const StateType & next );
+	bool addTransition ( std::ranked_symbol < SymbolType, RankType > current, std::vector < StateType > children, StateType next );
 
 	/**
 	 * Removes transition from the automaton.
@@ -172,7 +172,7 @@ AutomatonBase* DFTA < SymbolType, RankType, StateType >::plunder() && {
 }
 
 template<class SymbolType, class RankType, class StateType >
-bool DFTA < SymbolType, RankType, StateType >::addTransition(const std::ranked_symbol < SymbolType, RankType > & symbol, const std::vector<StateType> & prevStates, const StateType & next) {
+bool DFTA < SymbolType, RankType, StateType >::addTransition ( std::ranked_symbol < SymbolType, RankType > symbol, std::vector<StateType> prevStates, StateType next) {
 	if ( prevStates.size() != ( size_t ) symbol.getRank() )
 		throw AutomatonException("Number of states doesn't match rank of the symbol");
 
@@ -182,12 +182,12 @@ bool DFTA < SymbolType, RankType, StateType >::addTransition(const std::ranked_s
 	if (! getStates().count(next))
 		throw AutomatonException("State \"" + std::to_string ( next ) + "\" doesn't exist.");
 
-	for (const StateType& it : prevStates) {
+	for ( const StateType & it : prevStates) {
 		if (! getStates().count(it))
 			throw AutomatonException("State \"" + std::to_string ( it ) + "\" doesn't exist.");
 	}
 
-	std::pair<std::ranked_symbol < SymbolType, RankType >, std::vector<StateType> > key = std::make_pair(symbol, prevStates);
+	std::pair<std::ranked_symbol < SymbolType, RankType >, std::vector<StateType> > key = std::make_pair ( std::move ( symbol ), std::move ( prevStates ) );
 	if ( transitions.find ( key ) != transitions.end ( ) ) {
 		if ( transitions.find ( key )->second == next )
 			return false;
@@ -195,7 +195,7 @@ bool DFTA < SymbolType, RankType, StateType >::addTransition(const std::ranked_s
 			throw AutomatonException("Transition already exists");
 	}
 
-	transitions.insert(std::make_pair(key, next));
+	transitions.insert ( std::make_pair ( std::move ( key ), std::move ( next ) ) );
 	return true;
 }
 
diff --git a/alib2data/src/automaton/TA/NFTA.h b/alib2data/src/automaton/TA/NFTA.h
index ac5e8af6fda41d9f6af7ea75c877c76a254d4616..f7996657cd6d400518faa6e6289b7481d120f771 100644
--- a/alib2data/src/automaton/TA/NFTA.h
+++ b/alib2data/src/automaton/TA/NFTA.h
@@ -105,7 +105,7 @@ public:
 	 * @param next next state
 	 * @throws AutomatonException when transition already exists or when transition contains state or symbol not present in the automaton
 	 */
-	bool addTransition ( const std::ranked_symbol < SymbolType, RankType > & current, const std::vector < StateType > & children, const StateType & next );
+	bool addTransition ( std::ranked_symbol < SymbolType, RankType > current, std::vector < StateType > children, StateType next );
 
 	/**
 	 * Removes transition from the automaton.
@@ -190,7 +190,7 @@ AutomatonBase* NFTA < SymbolType, RankType, StateType >::plunder() && {
 }
 
 template < class SymbolType, class RankType, class StateType >
-bool NFTA < SymbolType, RankType, StateType >::addTransition(const std::ranked_symbol < SymbolType, RankType > & symbol, const std::vector<StateType> & prevStates, const StateType & next) {
+bool NFTA < SymbolType, RankType, StateType >::addTransition ( std::ranked_symbol < SymbolType, RankType > symbol, std::vector<StateType> prevStates, StateType next) {
 	if (prevStates.size() != ( size_t ) symbol.getRank() )
 		throw AutomatonException("Number of states doesn't match rank of the symbol");
 
@@ -205,8 +205,8 @@ bool NFTA < SymbolType, RankType, StateType >::addTransition(const std::ranked_s
 			throw AutomatonException("State \"" + std::to_string ( it ) + "\" doesn't exist.");
 	}
 
-	std::pair<std::ranked_symbol < SymbolType, RankType >, std::vector<StateType> > key = std::make_pair(symbol, prevStates);
-	return transitions[key].insert(next).second;
+	std::pair<std::ranked_symbol < SymbolType, RankType >, std::vector < StateType > > key = std::make_pair ( std::move ( symbol ), std::move ( prevStates ) );
+	return transitions [ key ].insert ( std::move ( next ) ).second;
 }
 
 template < class SymbolType, class RankType, class StateType >