Repaired last commit.
Removed Tuple, using commons-lang3 Pair, ImmutablePair, MutablePair instead