Hi Ramesh, Can we get this workaround as a patch in teiid 8.1. If we have to write a new method for createDataSource similar to the one we have in Teiid Admin API, what all changes are required in existing createDataSource method to incorporate this work around.