Removed support for list of pairs (rebase before merge)