Added support for overlapping TGDs