Stop using Pair type