Adding Move and Pair classes