Moved and modified Pair, added dependencies