Changed Pair to be more generic
forgot some stuff in last commit