Use interfaces instead of the sets directly
Merge pull request #108 from andypelzer/develop

Use interfaces instead of the sets directly