Added pair handling