Added basic Pair, Point functionality