Added pair-from to exports