Further integration into pe and switch to Pair of apache commons instead
of own Tuple class.