Add support for more than one pair