Added factor pairs class