Redesign of the map adaptors.
/smart reference handling only used by functions/

Better handling of the function objects and functions.

\\\todo May we use operators instead of the addMap, subMap...?