diff --git a/include/rosa/agent/Abstraction.hpp b/include/rosa/agent/Abstraction.hpp
index 1c5a3c1..032c970 100644
--- a/include/rosa/agent/Abstraction.hpp
+++ b/include/rosa/agent/Abstraction.hpp
@@ -1,194 +1,225 @@
 //===-- rosa/agent/Abstraction.hpp ------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/Abstraction.hpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Definition of *abstraction* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_ABSTRACTION_HPP
 #define ROSA_AGENT_ABSTRACTION_HPP
 
 #include "rosa/agent/Functionality.h"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <map>
 
 namespace rosa {
 namespace agent {
 
 /// Abstracts values from a type to another one.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A> class Abstraction : public Functionality {
-
-public:
-
+protected:
   /// Value to abstract to by default.
   const A Default;
-
+public:
   /// Creates an instance.
   ///
   /// \param Default value to abstract to by default
   Abstraction(const A Default) noexcept : Default(Default) {}
 
   /// Destroys \p this object.
   ~Abstraction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  bool isDefaultAt(const T &V) const{
+    (void)V;
+	return true;
+  }
+
   /// Abstracts a value from type \p T to type \p A.
   ///
   /// \note The default implementation always returns
   /// \c rosa::agent::Abstraction::Default, hence the actual argument is
   /// ignored.
   ///
   /// \return the abstracted value
   virtual A operator()(const T &) const noexcept { return Default; }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from a type to
 /// another one.
 ///
 /// \note This implementation is supposed to be used to abstract between
 /// enumeration types, which is statically enforced.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class MapAbstraction : public Abstraction<T, A>, private std::map<T, A> {
   // Make sure the actual type arguments are enumerations.
   STATIC_ASSERT((std::is_enum<T>::value && std::is_enum<A>::value),
                 "mapping not enumerations");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<T, A>::end;
   using std::map<T, A>::find;
 
 public:
   /// Creates an instance by initializing the underlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   MapAbstraction(const std::map<T, A> &Map, const A Default) noexcept
       : Abstraction<T, A>(Default),
         std::map<T, A>(Map) {}
 
   /// Destroys \p this object.
   ~MapAbstraction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  bool isDefaultAt(const T &V) const {
+    const auto I = find(V);
+    return I == end() ? true : false;
+  }
+  
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::MapAbstraction::Default if the actual argument is not
   /// associated with anything by the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     const auto I = find(V);
     return I == end() ? Default : *I;
   }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from ranges of a
 /// type to values of another type.
 ///
 /// \note This implementation is supposed to be used to abstract ranges of
 /// arithmetic types into enumerations, which is statically enforced.
 ///
 /// \invariant The keys in the underlying \c std::map define valid ranges
 /// such that `first <= second` and there are no overlapping ranges defined by
 /// the keys.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class RangeAbstraction : public Abstraction<T, A>,
                          private std::map<std::pair<T, T>, A> {
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value), "abstracting not arithmetic");
   /// \todo check if this compiles with the definition of abstractions as
   /// self-aware properties
   //STATIC_ASSERT((std::is_enum<A>::value), "abstracting not to enumeration");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<std::pair<T, T>, A>::begin;
   using std::map<std::pair<T, T>, A>::end;
   using std::map<std::pair<T, T>, A>::find;
 
 public:
   /// Creates an instance by Initializing the unserlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   ///
   /// \pre Each key defines a valid range such that `first <= second` and
   /// there are no overlapping ranges defined by the keys.
   RangeAbstraction(const std::map<std::pair<T, T>, A> &Map, const A &Default)
       : Abstraction<T, A>(Default), std::map<std::pair<T, T>, A>(Map) {
     // Sanity check.
     ASSERT(std::all_of(
         begin(), end(), [this](const std::pair<std::pair<T, T>, A> &P) {
           return P.first.first <= P.first.second &&
                  std::all_of(++find(P.first), end(),
                              [&P](const std::pair<std::pair<T, T>, A> &R) {
                                // \note Values in \c Map are sorted.
                                return P.first.first < P.first.second &&
                                           P.first.second <= R.first.first ||
                                       P.first.first == P.first.second &&
                                           P.first.second < R.first.first;
                              });
         }));
   }
 
   /// Destroys \p this object.
   ~RangeAbstraction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  bool isDefaultAt(const T &V) const{
+    auto I = begin();
+    bool Found = false;  // Indicates if \c I refers to a matching range.
+    bool Failed = false; // Indicates if it is pointless to continue searching.
+    while (!Found && !Failed && I != end()) {
+      if (V < I->first.first) {
+        // No match so far and \p V is below the next range, never will match.
+        // \note Keys are sorted in the map.
+        return true;
+      } else if (I->first.first <= V && V < I->first.second) {
+        // Matching range found.
+        return false;
+      } else {
+        // Cannot conclude in this step, move to the next range.
+        ++I;
+      }
+    }
+    return true;
+  }
+
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::RangeAbstraction::Default if the actual argument is not
   /// included in any of the ranges in the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     auto I = begin();
     bool Found = false;  // Indicates if \c I refers to a matching range.
     bool Failed = false; // Indicates if it is pointless to continue searching.
     while (!Found && !Failed && I != end()) {
       if (V < I->first.first) {
         // No match so far and \p V is below the next range, never will match.
         // \note Keys are sorted in the map.
         Failed = true;
       } else if (I->first.first <= V && V < I->first.second) {
         // Matching range found.
         Found = true;
       } else {
         // Cannot conclude in this step, move to the next range.
         ++I;
       }
     }
     ASSERT(!Found || I != end());
     return Found ? I->second : Default;
   }
 };
 
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_ABSTRACTION_HPP
diff --git a/include/rosa/agent/FunctionAbstractions.hpp b/include/rosa/agent/FunctionAbstractions.hpp
index 31bbea4..606125a 100644
--- a/include/rosa/agent/FunctionAbstractions.hpp
+++ b/include/rosa/agent/FunctionAbstractions.hpp
@@ -1,175 +1,194 @@
 //===-- rosa/agent/FunctionAbstractions.hpp ---------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/FunctionAbstractions.hpp
 ///
 /// \author Benedikt Tutzer (benedikt.tutzer@tuwien.ac.at)
 ///
 /// \date 2019
 ///
 /// \brief Definition of *FunctionAbstractions* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP
 #define ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP
 
 #include "rosa/agent/Functionality.h"
 #include "rosa/agent/Abstraction.hpp"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <vector>
 #include <cmath>
 #include <memory>
 
 namespace rosa {
 namespace agent {
 
 /// Evaluates a linear function at a given value.
 ///
 /// \tparam T type of the functions domain
 /// \tparam A type of the functions range
 template <typename T, typename A> class LinearFunction :
 	public Abstraction<T, A>{
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value),
     "LinearFunction not arithmetic T");
   STATIC_ASSERT((std::is_arithmetic<A>::value),
     "LinearFunction not to arithmetic");
 protected:
   const T Intercept;
   const T Coefficient;
 
 public:
   /// Creates an instance.
   ///
   /// \param Intercept the intercept of the linear function
   /// \param Coefficient the coefficient of the linear function
   /// domain
   LinearFunction(T Intercept, T Coefficient) noexcept
       : Abstraction<T, A>(Intercept),
         Intercept(Intercept),
         Coefficient(Coefficient) {}
 
   /// Destroys \p this object.
   ~LinearFunction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  /// As LinearFunctions can be evaluated everythwere, this is always false
+  bool isDefaultAt(const T &V) const{
+    (void)V;
+    return false;
+  }
+
   /// Evaluates the linear function
   ///
   /// \param X the value at which to evaluate the function
   /// \return the result
   virtual A operator()(const T &X) const noexcept override {
     return Intercept + X*Coefficient;
   }
 };
 
 /// Evaluates a sine function at a given value.
 ///
 /// \tparam T type of the functions domain
 /// \tparam A type of the functions range
 template <typename T, typename A> class SineFunction :
 	public Abstraction<T, A>{
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value),
     "SineFunction not arithmetic T");
   STATIC_ASSERT((std::is_arithmetic<A>::value),
     "SineFunction not to arithmetic");
 protected:
   const T Frequency;
   const T Amplitude;
   const T Phase;
   const T Average;
 
 public:
   /// Creates an instance.
   ///
   /// \param Frequency the frequency of the sine wave
   /// \param Amplitude the amplitude of the sine wave
   /// \param Phase the phase of the sine wave
   /// \param Average the average of the sine wave
   /// domain
   SineFunction(T Frequency, T Amplitude, T Phase, T Average) noexcept
       : Abstraction<T, A>(Average),
         Frequency(Frequency),
         Amplitude(Amplitude),
         Phase(Phase),
         Average(Average) {}
 
   /// Destroys \p this object.
   ~SineFunction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  /// As SineFunctions can be evaluated everythwere, this is always false
+  bool isDefaultAt(const T &V) const{
+    (void)V;
+    return false;
+  }
+
   /// Evaluates the linear function
   ///
   /// \param X the value at which to evaluate the function
   /// \return the result
   virtual A operator()(const T &X) const noexcept override {
     return Amplitude*sin(Frequency * X + Phase) + Average;
   }
 };
 
 /// Implements \c rosa::agent::RangeAbstraction as an abstraction from
 /// \c std::map from ranges of a type to abstractions of that type to another
 /// type. The resulting abstractions are evaluated for the given values.
 ///
 /// \note This implementation is supposed to be used to abstract ranges of
 /// arithmetic types into abstractions from that type to another arithmetic
 /// type, which is statically enforced.
 ///
 /// \invariant The keys in the underlying \c std::map define valid ranges
 /// such that `first <= second` and there are no overlapping ranges defined by
 /// the keys.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class PartialFunction : public Abstraction<T, A> {
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value), "abstracting not arithmetic");
   STATIC_ASSERT((std::is_arithmetic<A>::value),
       "abstracting not to arithmetic");
 
 private:
   RangeAbstraction<T, std::shared_ptr<Abstraction<T, A>>> RA;
 
 public:
   /// Creates an instance by Initializing the underlying \c RangeAbstraction.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default abstraction to abstract to by default
   ///
   /// \pre Each key defines a valid range such that `first <= second` and
   /// there are no overlapping ranges defined by the keys.
   PartialFunction(const std::map<std::pair<T, T>,
       std::shared_ptr<Abstraction<T, A>>> &Map,
     const A Default)
       : Abstraction<T, A>(Default),
         RA(Map, std::shared_ptr<Abstraction<T, A>>
           (new Abstraction<T, A>(Default))) {
   }
 
   /// Destroys \p this object.
   ~PartialFunction(void) = default;
 
+  /// Checks wether the Abstraction evaluates to default at the given position
+  bool isDefaultAt(const T &V) const{
+    return RA.isDefaultAt(V);
+  }
+
   /// Evaluates an Abstraction from type \p T to type \p A based on the set
   /// mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::RangeAbstraction::Default if the actual argument is not
   /// included in any of the ranges in the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     return RA(V)->operator()(V);
   }
 };
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP
diff --git a/include/rosa/agent/RangeConfidence.hpp b/include/rosa/agent/RangeConfidence.hpp
index c5e86a6..83ba518 100644
--- a/include/rosa/agent/RangeConfidence.hpp
+++ b/include/rosa/agent/RangeConfidence.hpp
@@ -1,96 +1,90 @@
 //===-- rosa/agent/RangeConfidence.hpp --------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/RangeConfidence.hpp
 ///
 /// \author Benedikt Tutzer (benedikt.tutzer@tuwien.ac.at)
 ///
 /// \date 2019
 ///
 /// \brief Definition of *RangeConfidence* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_RANGECONFIDENCE_HPP
 #define ROSA_AGENT_RANGECONFIDENCE_HPP
 
 #include "rosa/agent/Functionality.h"
 #include "rosa/agent/Abstraction.hpp"
 #include "rosa/agent/FunctionAbstractions.hpp"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <vector>
 #include <cmath>
 #include <memory>
 
 namespace rosa {
 namespace agent {
 
 /// Evaluates a vector of Abstractions at a given value and returns the results
 /// as a vector
 ///
 /// \note This implementation is supposed to be used to abstract ranges of
 /// arithmetic types into vectors of another arithmetic type, which is
 /// statically enforced.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract a vector of to
 template <typename T, typename A, typename B>
 class RangeConfidence : protected Abstraction<T, std::map<A, B>>,
       private std::map<A, PartialFunction<T, B>>{
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value), "abstracting not arithmetic");
   STATIC_ASSERT((std::is_arithmetic<B>::value),
       "abstracting not to arithmetic");
 
-  // Bringing into scope inherited members.
-  using std::map<A, PartialFunction<T, B>>::size;
-  using std::map<A, PartialFunction<T, B>>::begin;
-  using std::map<A, PartialFunction<T, B>>::end;
-
 private:
   bool IgnoreDefaults;
 
 public:
   /// Creates an instance by Initializing the underlying \c RangeAbstraction.
   ///
   /// \param Abstractions the Abstractions to be evaluated
   RangeConfidence(const std::map<A, PartialFunction<T, B>> &Abstractions,
     bool IgnoreDefaults = false)
       : Abstraction<T, std::map<A, B>>({}),
         std::map<A, PartialFunction<T, B>>(Abstractions),
         IgnoreDefaults(IgnoreDefaults){
   }
 
   /// Destroys \p this object.
   ~RangeConfidence(void) = default;
 
   /// Evaluates an Abstraction from type \p T to type \p A based on the set
   /// mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::RangeAbstraction::Default if the actual argument is not
   /// included in any of the ranges in the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   std::map<A, B> operator()(const T &V) const noexcept override {
     std::map<A, B> ret;
     for (auto const& p : ((std::map<A, PartialFunction<T, B>>)*this)){
-      B res = p.second(V);
-      if(!IgnoreDefaults || p.second.Default != res)
-        ret.insert(std::pair<A, B>(p.first, res));
+      if(!IgnoreDefaults || !p.second.isDefaultAt(V))
+        ret.insert(std::pair<A, B>(p.first, p.second(V)));
     }
     return ret;
   }
 };
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_RANGECONFIDENCE_HPP