Support for paired collection and interface changes suggested by Bjorn Gruning (using selects instead of booleans for interface decision points)