Added includeSelf option