TEIID-2309 adding more conformed support