Seperate out CatTag enum and Pair class