Topic/plat 6692

This should really be List<Set<Tenor>> rather than Set<Tenor>[].