Added support for ambiguous restraints, switched to UPL format