Move to Pair class
Decouple Pair and ExpiresPair
add const methods