Added omitUnsupported flag