Added support for open term sets
Merge conflict