Add option to enforce full disjointness and throw an exception if not