Added option to skip discontinuous constituents